diff --git a/src/modules/08_KPI/components/Tab/04_Result.vue b/src/modules/08_KPI/components/Tab/04_Result.vue
index f553678..977e7e9 100644
--- a/src/modules/08_KPI/components/Tab/04_Result.vue
+++ b/src/modules/08_KPI/components/Tab/04_Result.vue
@@ -51,28 +51,28 @@ const sumResult = computed(() => {
 const group = computed(() => {
   return convert(sumResult.value);
 });
-const options = ref<any[]>([
-  {
-    label: "ดีเด่น (คะแนนร้อยละ ๙๐.๐๐ ขึ้นไป)",
-    value: "EXCELLENT",
-  },
-  {
-    label: "ดีมาก (คะแนนร้อยละ ๘๐.๐๐ - ๘๙.๙๙)",
-    value: "VERYGOOD",
-  },
-  {
-    label: "ดี (คะแนนร้อยละ ๗๐.๐๐ - ๗๙.๙๙)",
-    value: "GOOD",
-  },
-  {
-    label: "พอใช้ (คะแนนร้อยละ ๖๐.๐๐ - ๖๙.๙๙)",
-    value: "FAIR",
-  },
-  {
-    label: "ต้องปรับปรุง (คะแนนต่ำกว่าร้อยละ ๖๐.๐๐)",
-    value: "IMPROVEMENT",
-  },
-]);
+// const options = ref<any[]>([
+//   {
+//     label: "ดีเด่น (คะแนนร้อยละ ๙๐.๐๐ ขึ้นไป)",
+//     value: "EXCELLENT",
+//   },
+//   {
+//     label: "ดีมาก (คะแนนร้อยละ ๘๐.๐๐ - ๘๙.๙๙)",
+//     value: "VERYGOOD",
+//   },
+//   {
+//     label: "ดี (คะแนนร้อยละ ๗๐.๐๐ - ๗๙.๙๙)",
+//     value: "GOOD",
+//   },
+//   {
+//     label: "พอใช้ (คะแนนร้อยละ ๖๐.๐๐ - ๖๙.๙๙)",
+//     value: "FAIR",
+//   },
+//   {
+//     label: "ต้องปรับปรุง (คะแนนต่ำกว่าร้อยละ ๖๐.๐๐)",
+//     value: "IMPROVEMENT",
+//   },
+// ]);
 
 function convert(score: any): string {
   if (score >= 90) {
@@ -120,7 +120,7 @@ function onSubmitCommander() {
       showLoader();
       http
         .put(config.API.kpiSendToReason(id.value, "commander"), {
-          isReason: superiorCommentCheck.value,
+          isReason: superiorCommentCheck.value == "true" ? true : false,
           reason: superiorComment.value,
         })
         .then((res) => {
@@ -145,7 +145,7 @@ function onSubmitCommanderHigh() {
       showLoader();
       http
         .put(config.API.kpiSendToReason(id.value, "commanderHigh"), {
-          isReason: additionalSuperiorCheck.value,
+          isReason: additionalSuperiorCheck.value == "true" ? true : false,
           reason: additionalSuperiorComment.value,
         })
         .then((res) => {
@@ -180,7 +180,7 @@ async function fetchEvaluation() {
       const data = res.data.result;
       store.dataEvaluation = await data;
 
-      if (data.profileId == store.dataProfile.id) {
+      if (data.profileId == store.dataProfile.profileId) {
         userOpen();
       }
     })
@@ -207,10 +207,14 @@ function getData() {
       developmentMethod.value = data.developEvaluator;
       developmentPeriod.value = data.timeEvaluator;
       evaluatorComment.value = data.reasonEvaluator;
-      superiorCommentCheck.value = data.isReasonCommander.toString();
+      superiorCommentCheck.value = data.isReasonCommander
+        ? data.isReasonCommander.toString()
+        : "";
       superiorComment.value = data.reasonCommander;
 
-      additionalSuperiorCheck.value = data.isReasonCommanderHigh.toString();
+      additionalSuperiorCheck.value = data.isReasonCommanderHigh
+        ? data.isReasonCommanderHigh.toString()
+        : "";
       additionalSuperiorComment.value = data.reasonCommanderHigh;
       result1.value = data.totalPoint1;
       result2.value = data.totalPoint2_1 + data.totalPoint2_2;
@@ -227,6 +231,7 @@ onMounted(() => {
   fetchEvaluation();
 });
 </script>
+
 <template>
   <div class="q-pa-sm">
     <!-- 1-4 สรุปผลการประเมิน -->
diff --git a/src/modules/08_KPI/components/Tab/TabMain.vue b/src/modules/08_KPI/components/Tab/TabMain.vue
index cc90cd6..b4ad8fb 100644
--- a/src/modules/08_KPI/components/Tab/TabMain.vue
+++ b/src/modules/08_KPI/components/Tab/TabMain.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { onMounted, ref } from "vue";
 import { useKpiDataStore } from "@/modules/08_KPI/store";
 import { useRoute } from "vue-router";
 
 import Assessment from "@/modules/08_KPI/components/Tab/01_Assessment.vue";
 import Result from "@/modules/08_KPI/components/Tab/04_Result.vue";
-import CommanderAbove from "@/modules/08_KPI/components/Tab/03_CommanderAbove.vue";
-import CommanderAboveOneStep from "@/modules/08_KPI/components/Tab/04_CommanderAboveOneStep.vue";
+// import CommanderAbove from "@/modules/08_KPI/components/Tab/03_CommanderAbove.vue";
+// import CommanderAboveOneStep from "@/modules/08_KPI/components/Tab/04_CommanderAboveOneStep.vue";
 import File from "@/modules/08_KPI/components/Tab/05_File.vue";
 
 const store = useKpiDataStore();
@@ -63,7 +63,16 @@ const splitterModel = ref<number>(12);
           label="รายงานผลสำเร็จของงาน"
           :disable="store.tabOpen < 3"
         />
-        <q-tab name="4" label="สรุปผลการประเมิน" :disable="store.tabOpen < 4" />
+        <q-tab
+          name="4"
+          label="สรุปผลการประเมิน"
+          :disable="
+            store.tabOpen < 4 ||
+            (store.tabOpen == 4 &&
+              store.rolePerson === 'USER' &&
+              store.dataEvaluation.evaluationStatus != 'COMPLETE')
+          "
+        />
         <q-tab name="5" label="ไฟล์เอกสาร" />
       </q-tabs>
     </template>
diff --git a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
index 78d52ec..88ebe3f 100644
--- a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
@@ -268,9 +268,6 @@ const isEditStep3 = computed(() => {
       store.rolePerson === "USER" &&
       store.tabMain === "3") ||
     (store.dataEvaluation.evaluationStatus === "EVALUATING_EVALUATOR" &&
-      store.rolePerson === "EVALUATOR" &&
-      store.tabMain === "3") ||
-    (store.dataEvaluation.evaluationStatus === "EVALUATING" &&
       store.rolePerson === "EVALUATOR" &&
       store.tabMain === "3")
   );
diff --git a/src/modules/08_KPI/store.ts b/src/modules/08_KPI/store.ts
index f56432e..7894a9c 100644
--- a/src/modules/08_KPI/store.ts
+++ b/src/modules/08_KPI/store.ts
@@ -260,12 +260,11 @@ export const useKpiDataStore = defineStore("KPIDate", () => {
     const role = await (dataEvaluation.value.profileId ==
     dataProfile.value.profileId
       ? "USER"
-      : dataEvaluation.value.evaluatorId == (await dataProfile.value.profileId)
+      : dataEvaluation.value.evaluatorId == dataProfile.value.profileId
       ? "EVALUATOR"
-      : dataEvaluation.value.commanderId == (await dataProfile.value.profileId)
+      : dataEvaluation.value.commanderId == dataProfile.value.profileId
       ? "COMMANDER"
-      : dataEvaluation.value.commanderHighId ==
-        (await dataProfile.value.profileId)
+      : dataEvaluation.value.commanderHighId == dataProfile.value.profileId
       ? "COMMANDERHIGH"
       : "");
     // console.log("🚀 ~ checkStep ~ role:", role);
@@ -274,41 +273,54 @@ export const useKpiDataStore = defineStore("KPIDate", () => {
     switch (dataEvaluation.value.evaluationStatus) {
       case "NEW":
         tabOpen.value = 1;
+        tabMain.value = "1";
         break;
       case "NEW_EVALUATOR":
         tabOpen.value = 1;
+        tabMain.value = "1";
         break;
       case "NEW_COMMANDER":
         tabOpen.value = 1;
+        tabMain.value = "1";
         break;
       case "NEW_COMMANDER_HIGH":
         tabOpen.value = 1;
+        tabMain.value = "1";
         break;
       case "APPROVE":
         tabOpen.value = 2;
+        tabMain.value = "2";
         break;
       case "EVALUATING":
         tabOpen.value = 3;
+        tabMain.value = "3";
         break;
       case "EVALUATING_EVALUATOR":
         tabOpen.value = 3;
+        tabMain.value = "3";
         break;
       case "SUMMARY":
         tabOpen.value = 4;
+        tabMain.value = "3";
         break;
       case "SUMMARY_COMMANDER":
         tabOpen.value = 4;
+        tabMain.value = "3";
         break;
       case "SUMMARY_COMMANDER_HIGH":
         tabOpen.value = 4;
+        tabMain.value = "3";
         break;
       case "COMPLETE":
         tabOpen.value = 4;
+        tabMain.value = "4";
         break;
       default:
         tabOpen.value = 1;
+        tabMain.value = "1";
         break;
     }
+    // console.log("🚀 ~ tabMain ~ role:", tabMain.value);
   }
 
   // SUMMARY GENERAL CASE
diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue
index fc7a664..951137b 100644
--- a/src/modules/08_KPI/views/form.vue
+++ b/src/modules/08_KPI/views/form.vue
@@ -66,8 +66,8 @@ async function fetchEvaluation() {
       store.dataEvaluation = await data;
       formProfile.status = store.convertStatus(data.evaluationStatus);
       formProfile.result = store.convertResults(data.evaluationResults);
-      await store.checkCompetency();
-      await store.checkCompetencyDefaultCompetencyLevel();
+      store.checkCompetency();
+      store.checkCompetencyDefaultCompetencyLevel();
 
       fetchProfile(data.profileId);
 
@@ -91,6 +91,7 @@ async function getProfile() {
     .then(async (res) => {
       const data = await res.data.result;
       store.dataProfile = await data;
+      await store.checkStep();
     })
     .catch((e) => {
       messageError($q, e);
@@ -251,12 +252,11 @@ function filterOption(val: any, update: Function, refData: string) {
 
 async function getAll() {
   await fetchEvaluation();
-  await getProfile();
-  await getOrgOp();
-  await store.checkStep();
+  getProfile();
+  getOrgOp();
 }
 
-function sendToEvaluatore(status: string) {
+function sendToEvaluatore() {
   dialogConfirm(
     $q,
     () => {
@@ -264,7 +264,7 @@ function sendToEvaluatore(status: string) {
         showLoader();
         http
           .put(config.API.kpiSendToStatus(id.value), {
-            status: status,
+            status: "NEW_EVALUATOR",
           })
           .then((res) => {
             success($q, "ส่งข้อตกลงให้ผู้ประเมินอนุมัติสำเร็จ");
@@ -283,6 +283,32 @@ function sendToEvaluatore(status: string) {
   );
 }
 
+function sendToEvaluateEvaluatore() {
+  dialogConfirm(
+    $q,
+    () => {
+      if (id.value) {
+        showLoader();
+        http
+          .put(config.API.kpiSendToStatus(id.value), {
+            status: "EVALUATING_EVALUATOR",
+          })
+          .then((res) => {
+            success($q, "ส่งให้ผู้ประเมินรายงานผลสำเร็จของงานสำเร็จ");
+            close();
+          })
+          .catch((e) => {
+            messageError($q, e);
+          })
+          .finally(() => {
+            hideLoader();
+          });
+      }
+    },
+    "ยืนยันการส่งให้ผู้ประเมินรายงานผลสำเร็จของงาน",
+    "ต้องการยืนยันส่งให้ผู้ประเมินรายงานผลสำเร็จของงานใช่หรือไม่?"
+  );
+}
 // function sendToSummary(status: string) {
 //   dialogConfirm(
 //     $q,
@@ -347,7 +373,7 @@ function sendToEvauator() {
     showLoader();
     http
       .post(config.API.sendToCommander, {
-        evaluationStatus: "EVALUATING",
+        status: "EVALUATING",
         id: [store.dataEvaluation.id],
       })
       .then(async (res) => {
@@ -454,7 +480,9 @@ onMounted(async () => {
               >
                 <div class="row col-12 items-center justify-center">
                   <span class="text-h6 text-weight-medium text-primary">{{
-                    `${store.dataEvaluation.prefix}${store.dataEvaluation.firstName} ${store.dataEvaluation.lastName}`
+                    store.dataEvaluation.firstName
+                      ? `${store.dataEvaluation.prefix}${store.dataEvaluation.firstName} ${store.dataEvaluation.lastName}`
+                      : ""
                   }}</span>
                   <q-space v-if="$q.screen.gt.xs" />
 
@@ -495,12 +523,13 @@ onMounted(async () => {
                       color="grey-2"
                       text-color="blue-6"
                       size="md"
-                      @click="sendToEvaluatore('NEW_EVALUATOR')"
+                      @click="sendToEvaluatore()"
                     >
                       <q-tooltip>ส่งให้ผู้ประเมินอนุมัติ</q-tooltip>
                     </q-btn>
                     <q-btn
                       v-if="
+                        store.rolePerson == 'USER' &&
                         store.tabMain == '2' &&
                         store.dataEvaluation.evaluationStatus == 'APPROVE'
                       "
@@ -526,7 +555,7 @@ onMounted(async () => {
                       color="grey-2"
                       text-color="blue-6"
                       size="md"
-                      @click="sendToEvaluatore('EVALUATING_EVALUATOR')"
+                      @click="sendToEvaluateEvaluatore()"
                     >
                       <q-tooltip
                         >ส่งให้ผู้ประเมินรายงานผลสำเร็จของงาน</q-tooltip
@@ -577,8 +606,10 @@ onMounted(async () => {
                           'EVALUATING_EVALUATOR'
                       "
                       :disabled="
-                        store.dataEvaluation.evaluatorId == null ||
-                        store.dataEvaluation.summaryPoint <= 0
+                        store.indicatorScoreVal +
+                          store.competencyScoreVal +
+                          store.devScoreVal <=
+                        0
                       "
                       unelevated
                       round
@@ -592,6 +623,7 @@ onMounted(async () => {
                     </q-btn>
 
                     <q-btn
+                      v-if="store.rolePerson == 'USER'"
                       unelevated
                       round
                       icon="mdi-account"
diff --git a/src/modules/08_KPI/views/main.vue b/src/modules/08_KPI/views/main.vue
index ec9ffcc..269582b 100644
--- a/src/modules/08_KPI/views/main.vue
+++ b/src/modules/08_KPI/views/main.vue
@@ -273,10 +273,10 @@ function getProfile() {
   http
     .get(config.API.profilePosition())
     .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
       store.dataProfile = data;
-      await store.checkCompetency();
-      await store.checkCompetencyDefaultCompetencyLevel();
+      store.checkCompetency();
+      store.checkCompetencyDefaultCompetencyLevel();
 
       formRound.profileId = data.profileId;
       formRound.prefix = data.prefix;