diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue
index c1960f4c4..6de188d34 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue
@@ -227,7 +227,7 @@ const columns = ref<QTableProps["columns"]>([
  * @param to ตำแหน่งที่จะย้ายไป
  */
 function onDrop(from: number, to: number) {
-  rows.value.splice(to, 0, rows.value.splice(from, 1)[0]);
+  rows.value.splice(to - 1, 0, rows.value.splice(from - 1, 1)[0]);
   selected.value.push(rows.value[0]);
 }
 
@@ -296,18 +296,11 @@ watch(modal, async () => {
             row-key="id"
             hide-bottom
             hide-pagination
-            hide-header
             selection="multiple"
+            class="custom-header-table"
             v-model:selected="selected"
           >
-            <template v-slot:header-selection="scope">
-              <q-checkbox
-                keep-color
-                color="primary"
-                dense
-                v-model="scope.checkBox"
-              />
-            </template>
+            <template v-slot:header-selection="scope"> </template>
             <template v-slot:body="props">
               <q-tr :props="props">
                 <q-td>
diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
index c015d51e3..187fdbfe5 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -208,7 +208,9 @@ function fetchRoleByid(id: string) {
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
       formDetail.startDate = data.startDate;
       formDetail.endDate = data.endDate;
-
+      formDetail.nodeName = data.nodeName;
+      formDetail.includingName = data.includingName;
+      formDetail.including = data.including;
       listCheckID.value = data.kpiRoleId;
       // clickList(data.kpiRoleId, true);
     })
@@ -274,6 +276,8 @@ function fetchspecialByid(id: string) {
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
       formDetail.startDate = data.startDate;
       formDetail.endDate = data.endDate;
+
+      listCheckID.value = data.kpiSpecialId;
     })
     .catch((err) => {
       messageError($q, err);
@@ -370,7 +374,7 @@ function closeDialog() {
 
   formDetail.nodeName = "";
   formDetail.strategyName = "";
-  
+
   formFilter.isAll = false;
   formFilter.keyword = "";
   formFilter.node = 0;