diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue
index cac1f34d0..458848879 100644
--- a/src/modules/06_retirement/components/ListRetirement/AddList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue
@@ -132,6 +132,9 @@ const fecthProfile = async () => {
       );
       rows.value = res.data.result.data.map((e: any) => ({
         id: e.id,
+        prefix:e.prefix,
+        firstName:e.firstName,
+        lastName:e.lastName,
         fullname: e.prefix + e.firstName + " " + e.lastName,
         position: e.position,
         level:
@@ -265,10 +268,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
             <q-tr :props="props" class="cursor-pointer">
               <q-td>{{ props.rowIndex + 1 }}</q-td>
               <q-td key="fullname" :props="props">
-                {{ props.row.fullname }}
+                {{ props.row.prefix ? props.row.prefix:'' }}{{ props.row.firstName ? props.row.firstName:'' }} {{ props.row.lastName ? props.row.lastName:'' }}
               </q-td>
               <q-td key="position" :props="props">
-                {{ props.row.position }}
+                {{ props.row.position ? props.row.position:'-' }}
               </q-td>
               <q-td key="level" :props="props">{{ props.row.level }}</q-td>
               <q-td
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index d7dc3d014..22da727f7 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -53,7 +53,7 @@ const dataProfile = ref<Object>([]);
 
 /** คอลัมน์ที่แสดง */
 const columns = ref<any["columns"]>([]);
-const rows = ref<any>([]);
+const rows = ref<any[]>([]);
 const visibleColumns = ref<string[]>([
   "order",
   "name",
@@ -101,6 +101,9 @@ const fecthlistprofile = async (id: string) => {
         id: e.id,
         profileId: e.profileId,
         order: e.order,
+        prefix: e.prefix,
+        firstName: e.firstName,
+        lastName: e.lastName,
         name: e.prefix + e.firstName + " " + e.lastName,
         organization: e.root,
         position: e.position,
@@ -629,7 +632,11 @@ function updatemodalPersonal(modal: boolean) {
               @click.stop="onclickViewinfo(props.row.profileId)"
             >
               <q-td key="order" :props="props">{{ props.row.order }} </q-td>
-              <q-td key="name" :props="props">{{ props.row.name }}</q-td>
+              <q-td key="name" :props="props"
+                >{{ props.row.prefix ? props.row.prefix : ""
+                }}{{ props.row.firstName ? props.row.firstName : "" }}
+                {{ props.row.lastName ? props.row.lastName : "" }}</q-td
+              >
               <!-- <q-td
                 class="table_ellipsis"
                 key="organizationOrganization"
@@ -637,7 +644,7 @@ function updatemodalPersonal(modal: boolean) {
                 >{{ props.row.organizationOrganization }}</q-td
               > -->
               <q-td key="position" :props="props">{{
-                props.row.position
+                props.row.position ? props.row.position:'-'
               }}</q-td>
               <q-td key="positionType" :props="props"
                 >{{ props.row.positionType ? props.row.positionType : "-" }}
@@ -649,7 +656,7 @@ function updatemodalPersonal(modal: boolean) {
               </q-td>
 
               <q-td key="positionNumber" :props="props">{{
-                props.row.positionNumber
+                props.row.positionNumber ? props.row.positionNumber:'-'
               }}</q-td>
               <!-- <q-td key="organizationAgency" :props="props">{{
                 props.row.organizationAgency
@@ -658,7 +665,7 @@ function updatemodalPersonal(modal: boolean) {
                 props.row.organizationGovernmentAgency
               }}</q-td> -->
               <q-td class="table_ellipsis" key="organization" :props="props">{{
-                props.row.organization
+                props.row.organization ? props.row.organization:'-'
               }}</q-td>
               <!-- <q-td class="table_ellipsis" key="bureau" :props="props">{{
                 props.row.bureau