diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index f97226ac7..e19aff683 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -62,32 +62,32 @@ const columns = ref<any["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "positionType",
+    name: "positionEmployeePosition",
     align: "left",
-    label: "ตำแหน่ง (ประเภท)",
+    label: "ตำแหน่ง",
     title: "ตำแหน่ง",
-    subtitle: "ประเภท",
-    field: "positionType",
+    // subtitle: "ประเภท",
+    field: "positionEmployeePosition",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "position",
+    name: "positionEmployeeLevel",
     align: "left",
-    label: "ตำแหน่ง (ทางการบริหาร)",
-    title: "ตำแหน่ง",
-    subtitle: "ทางการบริหาร",
-    field: "position",
+    label: "ระดับชั้น",
+    title: "ระดับชั้น",
+    // subtitle: "ทางการบริหาร",
+    field: "positionEmployeeLevel",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "positionLavel",
+    name: "positionEmployeeGroup",
     align: "left",
-    label: "ตำแหน่ง (ในสายงาน/ระดับ)",
-    title: "ตำแหน่ง",
-    subtitle: "ในสายงาน/ระดับ",
-    field: "positionLavel",
+    label: "กลุ่มงาน",
+    title: "กลุ่มงาน",
+    // subtitle: "ในสายงาน/ระดับ",
+    field: "positionEmployeeGroup",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -137,9 +137,9 @@ const visibleColumns = ref<string[]>([
   "fixname",
   "name",
   "organizationOrganization",
-  "positionType",
-  "position",
-  "positionLavel",
+  "positionEmployeePosition",
+  "positionEmployeeLevel",
+  "positionEmployeeGroup",
   "positionNumber",
   "govGroup",
   "govOffice",
@@ -180,10 +180,10 @@ const fecthlistprofile = async (id: string) => {
         fixname: e.prefix,
         name: e.fullName,
         organizationOrganization: e.organizationOrganization,
-        positionType: e.positionType,
-        position: e.position,
+        positionEmployeePosition: e.positionEmployeePosition,
+        positionEmployeeLevel: e.positionEmployeeLevel,
         positionNumber: e.posNo,
-        positionLavel: e.position,
+        positionEmployeeGroup: e.positionEmployeeGroup,
         bureau: e.oc,
         reason: e.reason,
         remove: e.remove,
@@ -572,14 +572,14 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 :props="props"
                 >{{ props.row.organizationOrganization }}</q-td
               >
-              <q-td key="positionType" :props="props">{{
-                props.row.positionType
+              <q-td key="positionEmployeePosition" :props="props">{{
+                props.row.positionEmployeePosition
               }}</q-td>
-              <q-td key="position" :props="props">{{
-                props.row.position
+              <q-td key="positionEmployeeLevel" :props="props">{{
+                props.row.positionEmployeeLevel
               }}</q-td>
-              <q-td key="positionLavel" :props="props">{{
-                props.row.positionLavel
+              <q-td key="positionEmployeeGroup" :props="props">{{
+                props.row.positionEmployeeGroup
               }}</q-td>
               <q-td key="positionNumber" :props="props">{{
                 props.row.positionNumber