diff --git a/src/modules/08_KPI/components/Tab/04_Result.vue b/src/modules/08_KPI/components/Tab/04_Result.vue
index 5527fa9..b44a57b 100644
--- a/src/modules/08_KPI/components/Tab/04_Result.vue
+++ b/src/modules/08_KPI/components/Tab/04_Result.vue
@@ -433,9 +433,7 @@ onMounted(() => {
       bordered
       class="q-mt-md"
       v-if="
-        store.rolePerson == 'COMMANDER' &&
-        evaluatorComment !== null &&
-        store.dataEvaluation.commanderId !== null
+        evaluatorComment !== null && store.dataEvaluation.commanderId !== null
       "
     >
       <q-form greedy @submit.prevent @validation-success="onSubmitCommander">
@@ -456,7 +454,11 @@ onMounted(() => {
                   val="true"
                   :disable="
                     store.dataEvaluation.evaluationStatus !==
-                    'SUMMARY_COMMANDER'
+                      'SUMMARY_COMMANDER' ||
+                    !(
+                      store.dataEvaluation.evaluationStatus ==
+                        'SUMMARY_COMMANDER' && store.rolePerson === 'COMMANDER'
+                    )
                   "
                   label="เห็นด้วยกับผลการประเมิน"
                   @click="resetCommander()"
@@ -469,7 +471,11 @@ onMounted(() => {
                   label="มีความเห็นต่าง ดังนี้"
                   :disable="
                     store.dataEvaluation.evaluationStatus !==
-                    'SUMMARY_COMMANDER'
+                      'SUMMARY_COMMANDER' ||
+                    !(
+                      store.dataEvaluation.evaluationStatus ==
+                        'SUMMARY_COMMANDER' && store.rolePerson === 'COMMANDER'
+                    )
                   "
                 />
               </div>
@@ -482,7 +488,12 @@ onMounted(() => {
                 outlined
                 :readonly="
                   superiorCommentCheck == 'true' ||
-                  store.dataEvaluation.evaluationStatus !== 'SUMMARY_COMMANDER'
+                  store.dataEvaluation.evaluationStatus !==
+                    'SUMMARY_COMMANDER' ||
+                  !(
+                    store.dataEvaluation.evaluationStatus ==
+                      'SUMMARY_COMMANDER' && store.rolePerson === 'COMMANDER'
+                  )
                 "
                 type="textarea"
                 label="ความเห็นของผู้บังคับบัญชาเหนือขึ้นไป"
@@ -493,17 +504,20 @@ onMounted(() => {
             </div>
           </div>
         </q-card-section>
-        <q-separator
-          v-if="store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER'"
-        />
-        <q-card-actions
-          align="right"
-          v-if="store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER'"
+
+        <div
+          v-if="
+            store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER' &&
+            store.rolePerson === 'COMMANDER'
+          "
         >
-          <q-btn label="บันทึก" color="secondary" type="submit"
-            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
-          >
-        </q-card-actions>
+          <q-separator />
+          <q-card-actions align="right">
+            <q-btn label="บันทึก" color="secondary" type="submit"
+              ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+            >
+          </q-card-actions>
+        </div>
       </q-form>
     </q-card>
 
@@ -511,8 +525,8 @@ onMounted(() => {
       bordered
       class="q-mt-md"
       v-if="
-        store.rolePerson == 'COMMANDERHIGH' &&
-        superiorComment !== '' &&
+        store.dataEvaluation.evaluationStatus !== 'SUMMARY' &&
+        store.dataEvaluation.evaluationStatus !== 'SUMMARY_COMMANDER' &&
         store.dataEvaluation.commanderHighId !== null
       "
     >
@@ -527,6 +541,7 @@ onMounted(() => {
           >
         </q-toolbar>
         <q-separator />
+
         <q-card-section>
           <div class="row q-col-gutter-sm">
             <div class="col-12">
@@ -534,7 +549,12 @@ onMounted(() => {
                 <q-radio
                   :disable="
                     store.dataEvaluation.evaluationStatus !==
-                    'SUMMARY_COMMANDER_HIGH'
+                      'SUMMARY_COMMANDER_HIGH' ||
+                    !(
+                      store.dataEvaluation.evaluationStatus ==
+                        'SUMMARY_COMMANDER_HIGH' &&
+                      store.rolePerson === 'COMMANDERHIGH'
+                    )
                   "
                   v-model="additionalSuperiorCheck"
                   checked-icon="task_alt"
@@ -546,7 +566,12 @@ onMounted(() => {
                 <q-radio
                   :disable="
                     store.dataEvaluation.evaluationStatus !==
-                    'SUMMARY_COMMANDER_HIGH'
+                      'SUMMARY_COMMANDER_HIGH' ||
+                    !(
+                      store.dataEvaluation.evaluationStatus ==
+                        'SUMMARY_COMMANDER_HIGH' &&
+                      store.rolePerson === 'COMMANDERHIGH'
+                    )
                   "
                   v-model="additionalSuperiorCheck"
                   checked-icon="task_alt"
@@ -568,28 +593,32 @@ onMounted(() => {
                 :readonly="
                   additionalSuperiorCheck == 'true' ||
                   store.dataEvaluation.evaluationStatus !==
-                    'SUMMARY_COMMANDER_HIGH'
+                    'SUMMARY_COMMANDER_HIGH' ||
+                  !(
+                    store.dataEvaluation.evaluationStatus ==
+                      'SUMMARY_COMMANDER_HIGH' &&
+                    store.rolePerson === 'COMMANDERHIGH'
+                  )
                 "
                 :rules="[(val:string) => additionalSuperiorCheck !== 'false'||!!val || `${'กรุณากรอกความเห็น'}`,]"
               />
             </div>
           </div>
         </q-card-section>
-        <q-separator
+
+        <div
           v-if="
-            store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER_HIGH'
-          "
-        />
-        <q-card-actions
-          align="right"
-          v-if="
-            store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER_HIGH'
+            store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER_HIGH' &&
+            store.rolePerson === 'COMMANDERHIGH'
           "
         >
-          <q-btn label="บันทึก" color="secondary" type="submit"
-            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
-          >
-        </q-card-actions>
+          <q-separator />
+          <q-card-actions align="right">
+            <q-btn label="บันทึก" color="secondary" type="submit"
+              ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+            >
+          </q-card-actions>
+        </div>
       </q-form>
     </q-card>
   </div>