diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue
index 72776d1ac..76af4380a 100644
--- a/src/modules/14_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue
@@ -8,7 +8,7 @@ import http from "@/plugins/http";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
-import type { ListCriteria } from "@/modules/14_KPI/interface/request/Index";
+import type { ListCriteria } from "@/modules/14_KPI/interface/request/index";
 
 import DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue";
 import Work from "@/modules/14_KPI/components/Tab/Topic/01_Indicator.vue";
@@ -233,7 +233,7 @@ onMounted(async () => {
       <!-- องค์ประกอบที่ 1 -->
       <div
         v-if="
-          store.dataEvaluation.posTypeName == 'อำนวยการ' &&
+          store.dataEvaluation.posTypeName == 'อำนวยการ' ||
           store.dataEvaluation.posTypeName == 'บริหาร'
         "
       >
diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue
index 6735cfbdc..2d2b47542 100644
--- a/src/modules/14_KPI/views/detailView.vue
+++ b/src/modules/14_KPI/views/detailView.vue
@@ -514,13 +514,12 @@ onUnmounted(() => {
                   !checkRoutePermisson
                 "
                 :disabled="
-                  (store.dataEvaluation.posTypeName != 'อำนวยการ' &&
-                    store.dataEvaluation.posTypeName != 'บริหาร' &&
+                  ((store.dataEvaluation.posTypeName != 'อำนวยการ' ||
+                    store.dataEvaluation.posTypeName != 'บริหาร') &&
                     store.indicatorWeightTotal != 100) ||
-                  (store.dataEvaluation.posTypeName == 'อำนวยการ' &&
-                    store.dataEvaluation.posTypeName == 'บริหาร' &&
-                    (store.indicatorWeight1Total != 100 ||
-                      store.indicatorWeight2Total != 20))
+                  ((store.dataEvaluation.posTypeName == 'อำนวยการ' ||
+                    store.dataEvaluation.posTypeName == 'บริหาร') &&
+                    store.indicatorWeightTotal != 100)
                 "
                 unelevated
                 round