diff --git a/frontend/modules/hospital/views/report/view.php b/frontend/modules/hospital/views/report/view.php
index d92ed821..c63dae33 100755
--- a/frontend/modules/hospital/views/report/view.php
+++ b/frontend/modules/hospital/views/report/view.php
@@ -103,8 +103,8 @@ if ($case_type === 'frozen') {
                                                     <?php if ($model->status_id == 18) { ?>
                                                          <?php
                                                             $revised = SurgicalDiagnosis::find()
-                                                            ->where(['report_type' => 'revised', 'surgical_diagnosis_id' => $cases->id])
-                                                            ->count();
+                                                                ->where(['report_type' => 'revised', 'surgical_diagnosis_id' => $cases->id])
+                                                                ->count();
                                                             ?>
                                                         <?php if ($revised > 0) { ?>
                                                         <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]), ['/report/report-log/log-report-view', 'id_case' => $model->id_case, 'report_type' => $cases->report_type, 'id' => $cases->id, 'mode' => 'final', 'file' => false, 'watermark' => true, 'pdf_type' => 'surgical'], ['target' => '_blank', 'class' => 'text-success']) ?>
@@ -346,7 +346,6 @@ if ($case_type === 'frozen') {
                                     <?php } // frozen 
                                     ?>
 
-
                                     <?php if (Yii::$app->pathology->getCaseType($model->id_case) == 'hpv') { ?>
                                         <tr>
                                             <td>
@@ -538,8 +537,8 @@ if ($case_type === 'frozen') {
                                     $tdContent = '';
                                     if ($model->status_id == 18) {
                                         $revised = SurgicalDiagnosis::find()
-                                                            ->where(['report_type' => 'revised', 'surgical_diagnosis_id' => $case->id])
-                                                            ->count();
+                                            ->where(['report_type' => 'revised', 'surgical_diagnosis_id' => $case->id])
+                                            ->count();
                                         if ($revised > 0) {
                                             $tdContent = Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]), ['/report/report-log/log-report-view', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'file' => false, 'watermark' => true, 'pdf_type' => 'surgical'], ['target' => '_blank', 'class' => 'text-success']);
                                         } else {
@@ -551,7 +550,7 @@ if ($case_type === 'frozen') {
                                         $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">ผลยังไม่ออก</span>';
                                     }
 
-                                    if ($case->report_type == 'outlab') {
+                                    /*if ($case->report_type == 'outlab') {
                                         //$tdContent = 'outlab';
                                         if ($case->status_id < 11) {
                                             $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">รอพยาธิแพทย์ ออกผล</span>';
@@ -569,7 +568,7 @@ if ($case_type === 'frozen') {
                                                 }
                                             }
                                         }
-                                    }
+                                    }*/
 
                                     $rt .= '<tr>';
                                     $rt .= '<td>' . $tdContent . '</td>';
@@ -620,8 +619,8 @@ if ($case_type === 'frozen') {
                                     $tdContent = '';
                                     if ($model->status_id == 18) {
                                         $revised = CytoNonGynDiagnosis::find()
-                                                            ->where(['report_type' => 'revised', 'cyto_non_gyn_diagnosis_id' => $case->id])
-                                                            ->count();
+                                            ->where(['report_type' => 'revised', 'cyto_non_gyn_diagnosis_id' => $case->id])
+                                            ->count();
                                         if ($revised > 0) {
                                             $tdContent = Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]), ['/report/report-log/log-report-view', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'file' => false, 'watermark' => true, 'pdf_type' => 'non-gyn'], ['target' => '_blank', 'class' => 'text-success']);
                                         } else {
@@ -633,7 +632,7 @@ if ($case_type === 'frozen') {
                                         $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">ผลยังไม่ออก</span>';
                                     }
 
-                                    if ($case->report_type == 'outlab') {
+                                    /*if ($case->report_type == 'outlab') {
                                         //$tdContent = 'outlab';
                                         if ($case->status_id < 11) {
                                             $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">รอพยาธิแพทย์ ออกผล</span>';
@@ -651,7 +650,7 @@ if ($case_type === 'frozen') {
                                                 }
                                             }
                                         }
-                                    }
+                                    }*/
 
                                     $rt .= '<tr>';
                                     $rt .= '<td>' . $tdContent . '</td>';
@@ -666,7 +665,6 @@ if ($case_type === 'frozen') {
                                 $rt .= '</table></div>';
                             } //non gyn count
                         }
-
                         if ($case_type == 'pap') {
                             $pap_count = CytoPapDiagnosis::find()
                                 ->where([
@@ -708,8 +706,8 @@ if ($case_type === 'frozen') {
                                     $tdContent = '';
                                     if ($model->status_id == 18) {
                                         $revised = CytoPapDiagnosis::find()
-                                                            ->where(['report_type' => 'revised', 'cyto_pap_diagnosis_id' => $case->id])
-                                                            ->count();
+                                            ->where(['report_type' => 'revised', 'cyto_pap_diagnosis_id' => $case->id])
+                                            ->count();
                                         if ($revised > 0) {
                                             $tdContent = Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]), ['/report/report-log/log-report-view', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'file' => false, 'watermark' => true, 'pdf_type' => 'pap'], ['target' => '_blank', 'class' => 'text-success']);
                                         } else {
@@ -721,7 +719,7 @@ if ($case_type === 'frozen') {
                                         $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">ผลยังไม่ออก</span>';
                                     }
 
-                                    if ($case->report_type == 'outlab') {
+                                    /* if ($case->report_type == 'outlab') {
                                         //$tdContent = 'outlab';
                                         if ($case->status_id < 11) {
                                             $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">รอพยาธิแพทย์ ออกผล</span>';
@@ -739,7 +737,7 @@ if ($case_type === 'frozen') {
                                                 }
                                             }
                                         }
-                                    }
+                                    }*/
 
                                     $rt .= '<tr>';
                                     $rt .= '<td>' . $tdContent . '</td>';
@@ -754,7 +752,6 @@ if ($case_type === 'frozen') {
                                 $rt .= '</table></div>';
                             } //pap count
                         }
-
                         if ($case_type == 'frozen') {
                             $frozen_count = FrozenDiagnosis::find()
                                 ->where([
@@ -790,8 +787,8 @@ if ($case_type === 'frozen') {
                                     $tdContent = '';
                                     if ($model->status_id == 18) {
                                         $revised = FrozenDiagnosis::find()
-                                                            ->where(['report_type' => 'revised', 'frozen_diagnosis_id' => $case->id])
-                                                            ->count();
+                                            ->where(['report_type' => 'revised', 'frozen_diagnosis_id' => $case->id])
+                                            ->count();
                                         if ($revised > 0) {
                                             $tdContent = Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]), ['/report/report-log/log-report-view', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'file' => false, 'watermark' => true, 'pdf_type' => 'frozen'], ['target' => '_blank', 'class' => 'text-success']);
                                         } else {
@@ -802,7 +799,7 @@ if ($case_type === 'frozen') {
                                         $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">ผลยังไม่ออก</span>';
                                     }
 
-                                    if ($case->report_type == 'outlab') {
+                                    /*if ($case->report_type == 'outlab') {
                                         //$tdContent = 'outlab';
                                         if ($case->status_id < 11) {
                                             $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">รอพยาธิแพทย์ ออกผล</span>';
@@ -820,7 +817,7 @@ if ($case_type === 'frozen') {
                                                 }
                                             }
                                         }
-                                    }
+                                    }*/
 
                                     $rt .= '<tr>';
                                     $rt .= '<td>' . $tdContent . '</td>';
@@ -876,7 +873,7 @@ if ($case_type === 'frozen') {
                                         $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">ผลยังไม่ออก</span>';
                                     }
 
-                                    if ($case->report_type == 'outlab') {
+                                    /*if ($case->report_type == 'outlab') {
                                         //$tdContent = 'outlab';
                                         if ($case->status_id < 11) {
                                             $tdContent = '<span class="badge border border-danger bg-danger-subtle text-danger">รอพยาธิแพทย์ ออกผล</span>';
@@ -894,7 +891,7 @@ if ($case_type === 'frozen') {
                                                 }
                                             }
                                         }
-                                    }
+                                    }*/
 
                                     $rt .= '<tr>';
                                     $rt .= '<td>' . $tdContent . '</td>';
@@ -926,7 +923,8 @@ if ($case_type === 'frozen') {
             <?= $this->title ?></h5>
     </div>
     <div class="card-body">
-        <?php // $this->render('../../../report/views/case/history_his', ['hn' => $case->h_n]) ?>
+        <?php // $this->render('../../../report/views/case/history_his', ['hn' => $case->h_n]) 
+        ?>
         <?= Html::a('<i class="ri-file-pdf-2-line"></i> View Report', 'http://192.168.207.14/patho/pathouser_old.php?inc_id=' . str_pad($model->h_n, 7, ' ', STR_PAD_LEFT), [
             'class' => 'btn btn-sm btn-info',
             'target' => '_blank'
diff --git a/frontend/modules/pathologist/views/order/update-diagnosis-surgical.php b/frontend/modules/pathologist/views/order/update-diagnosis-surgical.php
index 90b5c3ad..0d20925d 100755
--- a/frontend/modules/pathologist/views/order/update-diagnosis-surgical.php
+++ b/frontend/modules/pathologist/views/order/update-diagnosis-surgical.php
@@ -271,7 +271,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
 
         <h6 class="mt-4"><strong> Pathological Diagnosis</strong></h6>
-        <?= $form->field($model, 'diagnosis')->label(false)->textarea(['spellcheck' => true])->widget(CKEditor::class, [
+        <?= $form->field($diagnosis, 'diagnosis')->label(false)->textarea(['spellcheck' => true])->widget(CKEditor::class, [
             'preset' => 'custom',
             //'options' => ['id' => 'microscopic_description_editor'],
             'clientOptions' => [