diff --git a/src/modules/06_evaluate/components/Tab1.vue b/src/modules/06_evaluate/components/Tab1.vue
index 1763fe9..e5bd5d3 100644
--- a/src/modules/06_evaluate/components/Tab1.vue
+++ b/src/modules/06_evaluate/components/Tab1.vue
@@ -143,7 +143,8 @@ async function onCilckprPeviousStep(type: string) {
 }
 
 async function saveStep1() {
-  saveEvaluation(formSpec, formDetail.value);
+  showLoader();
+  await saveEvaluation(formSpec, formDetail.value);
 }
 
 async function updateCheckSpec(data: FormSpec) {
@@ -202,8 +203,6 @@ async function validateStep2() {
   }
   if (hasError.every((result) => result === true)) {
     store.step === 2 ? saveStep2() : saveStep6();
-  } else {
-    console.log("ไม่ผ่าน");
   }
 }
 
@@ -262,6 +261,8 @@ onMounted(async () => {
 
 <template>
   <div class="row q-col-gutter-md">
+    <!-- currentStep = {{ store.currentStep }}<br/>
+    step = {{ store.step }} -->
     <div class="col-xs-12 col-sm-3">
       <div class="toptitle">
         {{ props.title }}
diff --git a/src/modules/06_evaluate/components/step/step5.vue b/src/modules/06_evaluate/components/step/step5.vue
index 8544aca..5f5dbbf 100644
--- a/src/modules/06_evaluate/components/step/step5.vue
+++ b/src/modules/06_evaluate/components/step/step5.vue
@@ -64,7 +64,9 @@ async function fetchCheckDate() {
       .then((res) => {
         const data = res.data.result;
         dateStartAnnounce.value = date2Thai(data.dateStartAnnounce);
-        dateEndAnnounce.value = date2Thai(data.dateStartAnnounce);
+        const endDate = new Date(data.dateStartAnnounce);
+        endDate.setDate(endDate.getDate() + 30);
+        dateEndAnnounce.value = date2Thai(endDate);
       })
       .catch((err) => {}));
 }
diff --git a/src/modules/06_evaluate/stores/evaluationFunction.ts b/src/modules/06_evaluate/stores/evaluationFunction.ts
index 4cdd8df..d32cb71 100644
--- a/src/modules/06_evaluate/stores/evaluationFunction.ts
+++ b/src/modules/06_evaluate/stores/evaluationFunction.ts
@@ -140,14 +140,14 @@ async function saveEvaluation(formSpec: any, detail: any) {
   await http
     .post(config.API.evaluationCheckspec(), form)
     .then((res) => {
-      console.log(res);
+      fetchCheckStatus();
     })
     .catch((err) => {
       messageError($q, err);
     })
     .finally(() => {
-      hideLoader();
       fetchCheckStep(store?.evaluateId);
+      hideLoader();
     });
 }