diff --git a/frontend/modules/histo/controllers/HeController.php b/frontend/modules/histo/controllers/HeController.php
index 140a6bee..2d8d1084 100644
--- a/frontend/modules/histo/controllers/HeController.php
+++ b/frontend/modules/histo/controllers/HeController.php
@@ -57,6 +57,7 @@ class HeController extends Controller
           Yii::$app->session->setFlash('error', 'ไม่พบ Block ที่ต้องการ');
           return $this->redirect(['embed']);
         }
+        
         if (empty($case_block[1])) {
           Yii::$app->session->setFlash('error', 'กรุณาระบุ Block No.');
           return $this->redirect(['embed']);
diff --git a/frontend/modules/register/views/case/history-surgical.php b/frontend/modules/register/views/case/history-surgical.php
index 58512e8e..9e19bdb4 100644
--- a/frontend/modules/register/views/case/history-surgical.php
+++ b/frontend/modules/register/views/case/history-surgical.php
@@ -1,6 +1,5 @@
 <?php
 
-
 use common\models\CaseSurgical;
 use common\models\CenterApprove;
 use common\models\SurgicalDiagnosis;
@@ -17,7 +16,8 @@ use yii\helpers\Html;
                 'query' => CaseSurgical::find()
                     //->andFilterWhere(['given_name' => Html::encode($case->given_name)])
                     ->andFilterWhere(['h_n' => Html::encode($case->h_n)])
-                    ->andFilterWhere(['<>', 'id_case', Html::encode($case->id_case)])
+                    //->andFilterWhere(['<>', 'id_case', Html::encode($case->id_case)])
+                    ->orderBy(['register_at' => SORT_DESC])
             ]),
             'columns' => [
                 ['class' => 'yii\grid\SerialColumn'],
@@ -91,7 +91,6 @@ use yii\helpers\Html;
                                 $rt .= '</table>';
                             } //surgical count
                         }
-
                         return $rt;
                     }
                 ],
diff --git a/frontend/modules/report/views/case/view.php b/frontend/modules/report/views/case/view.php
index abfdbc44..c6968144 100644
--- a/frontend/modules/report/views/case/view.php
+++ b/frontend/modules/report/views/case/view.php
@@ -52,19 +52,16 @@ $this->params['breadcrumbs'][] = $this->title;
                             <?php if (empty($center_approve->release_at)) { ?>
                                 <div class="text-center"><span class="badge bg-danger">ตรวจสอบผลแล้วยังไม่ Release</span></div>
                             <?php } else { ?>
-
                                 <?php if ($case->report_type == 'outlab') { ?>
                                     <?php foreach ($case->getReport() as $file => $val) {  ?>
                                         <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]),  Yii::getAlias('@web') . '/' . $case->uploadReportFolder . '/' . $val, ['target' => '_blank', 'class' => 'text-success']); ?>
                                     <?php } ?>
                                 <?php } ?>
-
                                 <?php if ($case->report_type == 'consult-outlab') { ?>
                                     <?php foreach ($case->getConsultReport() as $file => $val) {  ?>
                                         <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]),  Yii::getAlias('@web') . '/' . $case->uploadConsultReportFolder . '/' . $val, ['target' => '_blank', 'class' => 'text-success']); ?>
                                     <?php } ?>
                                 <?php } ?>
-
                                 <?php if (Yii::$app->user->can('system')) { ?>
                                     <?php if (($case->report_type != 'outlab') && ($case->report_type != 'consult-outlab')) { ?>
                                         <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]), ['surgical-pdf', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'file' => false], ['target' => '_blank', 'class' => 'text-success']) ?>
@@ -73,9 +70,7 @@ $this->params['breadcrumbs'][] = $this->title;
                                     <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]), ['surgical-pdf', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'watermark' => 1, 'file' => false], ['target' => '_blank', 'class' => 'text-success']) ?>
                                     <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-green.png', ['width' => 30]), ['surgical-pdf', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'file' => false, 'watermark' => false], ['target' => '_blank', 'class' => 'text-success']) ?>
                                 <?php } ?>
-
                             <?php } ?>
-
                         <?php } else { ?>
                             <div class="text-center"><span class="badge bg-danger">รอตรวจสอบผล</span></div>
                         <?php } ?>
@@ -83,7 +78,6 @@ $this->params['breadcrumbs'][] = $this->title;
                 <?php } ?>
             <?php } // surgical 
             ?>
-
             <?php if (Yii::$app->pathology->getCaseType($model->id_case) == 'non-gyn') { ?>
                 <div class="col-12 text-center">
                     <h6 class="mt-4"><i class="ri-file-text-line"></i> Request File
@@ -137,9 +131,7 @@ $this->params['breadcrumbs'][] = $this->title;
                                     <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-red.png', ['width' => 30]), ['non-gyn-pdf', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'watermark' => 1, 'file' => false], ['target' => '_blank', 'class' => 'text-success']) ?>
                                     <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-green.png', ['width' => 30]), ['non-gyn-pdf', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'file' => false, 'watermark' => false], ['target' => '_blank', 'class' => 'text-success']) ?>
                                 <?php } ?>
-
                             <?php } ?>
-
                         <?php } else { ?>
                             <div class="text-center"><span class="badge bg-danger">รอตรวจสอบผล</span></div>
                         <?php } ?>
@@ -148,7 +140,6 @@ $this->params['breadcrumbs'][] = $this->title;
                 <?php } ?>
             <?php } // non-gyn 
             ?>
-
             <?php if (Yii::$app->pathology->getCaseType($model->id_case) == 'pap') { ?>
                 <div class="col-12 text-center">
                     <h6 class="mt-4"><i class="ri-file-text-line"></i> Request File
@@ -344,12 +335,10 @@ $this->params['breadcrumbs'][] = $this->title;
                                     <?= Html::a(Html::img(Yii::getAlias('@web') . '/img/icon/pdf-green.png', ['width' => 30]), ['dish-pdf', 'id_case' => $model->id_case, 'report_type' => $case->report_type, 'id' => $case->id, 'mode' => 'final', 'file' => false, 'watermark' => false], ['target' => '_blank', 'class' => 'text-success']) ?>
                                 <?php } ?>
                             <?php } ?>
-
                         <?php } else { ?>
                             <div class="text-center"><span class="badge badge-danger">รอตรวจสอบผล</span></div>
                         <?php } ?>
                     </div>
-
                 <?php } ?>
             <?php } // Dish 
             ?>
@@ -419,7 +408,6 @@ $this->params['breadcrumbs'][] = $this->title;
             <?php } // Autopsy 
             ?>
 
-
             <?php /* if (Yii::$app->pathology->getCaseType($model->id_case) == 'flow') { ?>
             <div class="col-12 text-center">
                 <h4 class="mt-4"><i data-feather="file-text" style="width: 13px; margin-bottom: -7px;"></i></span>