diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
index 3c81e4a..ccc8c19 100644
--- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue
+++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
@@ -318,7 +318,7 @@ onMounted(async () => {
                 borderless
                 readonly
                 :model-value="`${formDetail.posNo ? formDetail.posNo : '-'}`"
-                label="ตำแหน่งเลขที่"
+                label="เลขที่ตำแหน่ง"
               />
             </div>
             <div class="col-xs-6 col-sm-4 col-md-3">
diff --git a/src/modules/06_evaluate/stores/evaluteDetail.ts b/src/modules/06_evaluate/stores/evaluteDetail.ts
index 72558cd..86d83b1 100644
--- a/src/modules/06_evaluate/stores/evaluteDetail.ts
+++ b/src/modules/06_evaluate/stores/evaluteDetail.ts
@@ -102,7 +102,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
     {
       name: "posNo",
       align: "left",
-      label: "ตำแหน่งเลขที่",
+      label: "เลขที่ตำแหน่ง",
       sortable: true,
       field: "posNo",
       headerStyle: "font-size: 14px",
@@ -112,7 +112,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
     {
       name: "positionType",
       align: "left",
-      label: "ประเภทตำแหน่ง",
+      label: "ตำแหน่งประเภท",
       sortable: true,
       field: "positionType",
       headerStyle: "font-size: 14px",
diff --git a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
index 2a21011..d931c4f 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -86,8 +86,10 @@ const roundOp = ref<DataOptions[]>([
 ]);
 
 function fetchListPlan() {
-  formFilter.nodeId = store.dataProfile.nodeDnaId;
-  formFilter.node = store.dataProfile.node;
+  formFilter.nodeId = formFilter.isAll
+    ? store.dataProfile.rootDnaId
+    : store.dataProfile.nodeDnaId;
+  formFilter.node = formFilter.isAll ? 0 : store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
 
   showLoader();
@@ -146,8 +148,10 @@ function fetchListPlanByid(id: string) {
 }
 
 function fetchListRole() {
-  formFilter.nodeId = store.dataProfile.nodeDnaId;
-  formFilter.node = store.dataProfile.node;
+  formFilter.nodeId = formFilter.isAll
+    ? store.dataProfile.rootDnaId
+    : store.dataProfile.nodeDnaId;
+  formFilter.node = formFilter.isAll ? 0 : store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
   formFilter.position = store.dataProfile.position;
 
@@ -199,8 +203,6 @@ function fetchRoleByid(id: string) {
 }
 
 function fetchListSpecial() {
-  // formFilter.nodeId = store.dataProfile.nodeDnaId;
-  // formFilter.node = store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
 
   const body = {
diff --git a/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue b/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
index 50e2f3f..de67f8c 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
@@ -67,7 +67,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posMasterNoOld",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่ง",
     sortable: true,
     field: "posMasterNoOld",
     headerStyle: "font-size: 14px",