diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
index e4e0f1249..c5e87d9a1 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
@@ -6,7 +6,6 @@ import { QForm, useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRoute } from "vue-router";
-import DialogHistory from "@/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue";
 import { useProfileDataStore } from "@/modules/04_registryNew/stores/profile";
 const mixin = useCounterMixin();
 const $q = useQuasar();
@@ -105,7 +104,6 @@ const childrenDataEdit: any = reactive({
 
 function editForm(rows: any) {
   if (rows !== null) {
-
     fatherDataEdit.isHaveInfo = rows.fatherFirstName !== null ? 1 : 0;
     fatherDataEdit.isLive = rows.fatherLive ? 1 : 0;
     fatherDataEdit.citizenId = rows.fatherCitizenId;
@@ -286,7 +284,9 @@ const addChildren = async () => {
 };
 
 function deleteChildren(items: any) {
-  const index = childrenDataEdit.childrens.findIndex((r: any) => r.id == items.id);
+  const index = childrenDataEdit.childrens.findIndex(
+    (r: any) => r.id == items.id
+  );
 
   childrenDataEdit.childrens.splice(index, 1);
 }
@@ -356,17 +356,16 @@ onMounted(async () => {
           </div>
         </div>
         <div class="row items-center">
-          <div class="col-2">คำนำหน้าชื่อ</div>
-          <div class="col-2">
-            {{ fatherData.prefix ? fatherData.prefix : "-" }}
-          </div>
-          <div class="col-1">ชื่อ</div>
-          <div class="col-2">
-            {{ fatherData.firstName ? fatherData.firstName : "-" }}
-          </div>
-          <div class="col-1">นามสกุล</div>
-          <div class="col-2">
-            {{ fatherData.lastName ? fatherData.lastName : "-" }}
+          <div class="col-2">ชื่อ-นามสกุล</div>
+          <div class="col-6">
+            {{
+              fatherData.prefix
+                ? fatherData.prefix +
+                  fatherData.firstName +
+                  " " +
+                  fatherData.lastName
+                : "-"
+            }}
           </div>
           <div class="col-1">อาชีพ</div>
           <div class="col">
@@ -398,17 +397,16 @@ onMounted(async () => {
           </div>
         </div>
         <div class="row items-center">
-          <div class="col-2">คำนำหน้าชื่อ</div>
-          <div class="col-2">
-            {{ motherData.prefix ? motherData.prefix : "-" }}
-          </div>
-          <div class="col-1">ชื่อ</div>
-          <div class="col-2">
-            {{ motherData.firstName ? motherData.firstName : "-" }}
-          </div>
-          <div class="col-1">นามสกุล</div>
-          <div class="col-2">
-            {{ motherData.lastName ? motherData.lastName : "-" }}
+          <div class="col-2">ชื่อ-นามสกุล</div>
+          <div class="col-6">
+            {{
+              motherData.prefix
+                ? motherData.prefix +
+                  motherData.firstName +
+                  " " +
+                  motherData.lastName
+                : "-"
+            }}
           </div>
           <div class="col-1">อาชีพ</div>
           <div class="col">
@@ -440,17 +438,16 @@ onMounted(async () => {
           </div>
         </div>
         <div class="row items-center">
-          <div class="col-2">คำนำหน้าชื่อ</div>
-          <div class="col-2">
-            {{ spouseData.prefix ? spouseData.prefix : "-" }}
-          </div>
-          <div class="col-1">ชื่อ</div>
-          <div class="col-2">
-            {{ spouseData.firstName ? spouseData.firstName : "-" }}
-          </div>
-          <div class="col-1">นามสกุล</div>
-          <div class="col-2">
-            {{ spouseData.lastName ? spouseData.lastName : "-" }}
+          <div class="col-2">ชื่อ-นามสกุล</div>
+          <div class="col-6">
+            {{
+              spouseData.prefix
+                ? spouseData.prefix +
+                  spouseData.firstName +
+                  " " +
+                  spouseData.lastName
+                : "-"
+            }}
           </div>
           <div class="col-1">อาชีพ</div>
           <div class="col">
@@ -486,17 +483,16 @@ onMounted(async () => {
             </div>
           </div>
           <div class="row items-center">
-            <div class="col-2">คำนำหน้าชื่อ</div>
-            <div class="col-2">
-              {{ children.childrenPrefix }}
-            </div>
-            <div class="col-1">ชื่อ</div>
-            <div class="col-2">
-              {{ children.childrenFirstName }}
-            </div>
-            <div class="col-1">นามสกุล</div>
-            <div class="col-2">
-              {{ children.childrenLastName }}
+            <div class="col-2">ชื่อ-นามสกุล</div>
+            <div class="col-6">
+              {{
+                children.childrenPrefix
+                  ? children.childrenPrefix +
+                    children.childrenFirstName +
+                    " " +
+                    children.childrenLastName
+                  : "-"
+              }}
             </div>
             <div class="col-1">อาชีพ</div>
             <div class="col">
@@ -839,7 +835,11 @@ onMounted(async () => {
                 />
               </div>
             </div>
-            <q-card v-if="spouseDataEdit.isHave" bordered class="bg-grey-1 q-pa-md">
+            <q-card
+              v-if="spouseDataEdit.isHave"
+              bordered
+              class="bg-grey-1 q-pa-md"
+            >
               <div class="row q-col-gutter-md">
                 <div class="col">
                   <q-input
@@ -965,7 +965,10 @@ onMounted(async () => {
                 <q-tooltip> เพิ่มข้อมูล </q-tooltip>
               </q-btn>
             </div>
-            <div v-for="(items, index) in childrenDataEdit.childrens" :key="index">
+            <div
+              v-for="(items, index) in childrenDataEdit.childrens"
+              :key="index"
+            >
               <div class="col-12 row q-gutter-sm q-pb-xs q-mt-xs">
                 <div class="text-medium q-pl-md">
                   บุตรคนที่ : {{ index + 1 }}
@@ -1112,6 +1115,7 @@ onMounted(async () => {
       </q-form>
     </q-layout>
   </q-dialog>
+
   <q-dialog v-model="historyDialog" class="dialog" persistent>
     <q-layout
       view="lHh lpr lFf"
@@ -1132,7 +1136,7 @@ onMounted(async () => {
       <q-page-container>
         <q-page class="q-pa-md">
           <div v-if="historyRows.length === 0">ไม่พบข้อมูล</div>
-          <div v-else class="scroll" style="max-height: 70vh">
+          <div v-else class="scroll q-pa-md">
             <div>
               <div class="row text-right">
                 <div class="col-12">
@@ -1160,17 +1164,14 @@ onMounted(async () => {
                   </div>
                 </div>
                 <div class="row items-center">
-                  <div class="col-2">คำนำหน้าชื่อ</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].fatherPrefix }}
-                  </div>
-                  <div class="col-1">ชื่อ</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].fatherFirstName }}
-                  </div>
-                  <div class="col-1">นามสกุล</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].fatherLastName }}
+                  <div class="col-2">ชื่อ-นามสกุล</div>
+                  <div class="col-6">
+                    {{
+                      historyRows[index - 1].fatherPrefix +
+                      historyRows[index - 1].fatherFirstName +
+                      " " +
+                      historyRows[index - 1].fatherLastName
+                    }}
                   </div>
                   <div class="col-1">อาชีพ</div>
                   <div class="col">
@@ -1206,17 +1207,14 @@ onMounted(async () => {
                   </div>
                 </div>
                 <div class="row items-center">
-                  <div class="col-2">คำนำหน้าชื่อ</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].motherPrefix }}
-                  </div>
-                  <div class="col-1">ชื่อ</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].motherFirstName }}
-                  </div>
-                  <div class="col-1">นามสกุล</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].motherLastName }}
+                  <div class="col-2">ชื่อ-นามสกุล</div>
+                  <div class="col-6">
+                    {{
+                      historyRows[index - 1].motherPrefix +
+                      historyRows[index - 1].motherFirstName +
+                      " " +
+                      historyRows[index - 1].motherLastName
+                    }}
                   </div>
                   <div class="col-1">อาชีพ</div>
                   <div class="col">
@@ -1259,17 +1257,14 @@ onMounted(async () => {
                   </div>
                 </div>
                 <div class="row items-center">
-                  <div class="col-2">คำนำหน้าชื่อ</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].couplePrefix }}
-                  </div>
-                  <div class="col-1">ชื่อ</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].coupleFirstName }}
-                  </div>
-                  <div class="col-1">นามสกุล</div>
-                  <div class="col-2">
-                    {{ historyRows[index - 1].coupleLastName }}
+                  <div class="col-2">ชื่อ-นามสกุล</div>
+                  <div class="col-6">
+                    {{
+                      historyRows[index - 1].couplePrefix +
+                      historyRows[index - 1].coupleFirstName +
+                      " " +
+                      historyRows[index - 1].coupleLastName
+                    }}
                   </div>
                   <div class="col-1">อาชีพ</div>
                   <div class="col">
@@ -1318,17 +1313,14 @@ onMounted(async () => {
                     </div>
                   </div>
                   <div class="row items-center">
-                    <div class="col-2">คำนำหน้าชื่อ</div>
-                    <div class="col-2">
-                      {{ children.childrenPrefix }}
-                    </div>
-                    <div class="col-1">ชื่อ</div>
-                    <div class="col-2">
-                      {{ children.childrenFirstName }}
-                    </div>
-                    <div class="col-1">นามสกุล</div>
-                    <div class="col-2">
-                      {{ children.childrenLastName }}
+                    <div class="col-2">ชื่อ-นามสกุล</div>
+                    <div class="col-6">
+                      {{
+                        children.childrenPrefix +
+                        children.childrenFirstName +
+                        " " +
+                        children.childrenLastName
+                      }}
                     </div>
                     <div class="col-1">อาชีพ</div>
                     <div class="col">
@@ -1346,14 +1338,15 @@ onMounted(async () => {
               </div>
             </div>
           </div>
-          <q-footer>
-            <q-separator color="grey-4" />
-            <div class="q-pa-sm flex flex-center">
-              <q-pagination v-model="index" :max="historyRows.length" input />
-            </div>
-          </q-footer>
         </q-page>
       </q-page-container>
+
+      <q-footer>
+        <q-separator color="grey-4" />
+        <div class="q-pa-sm flex flex-center">
+          <q-pagination v-model="index" :max="historyRows.length" input />
+        </div>
+      </q-footer>
     </q-layout>
   </q-dialog>
 </template>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue
deleted file mode 100644
index 2f0f0b731..000000000
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyHistory.vue
+++ /dev/null
@@ -1,236 +0,0 @@
-<script setup lang="ts">
-import { ref, reactive, onMounted, watch } from "vue";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useCounterMixin } from "@/stores/mixin";
-import { QForm, useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const mixin = useCounterMixin();
-const $q = useQuasar();
-const {
-  dialogRemove,
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-  date2Thai,
-} = mixin;
-
-const historyRows = ref<any>([]);
-
-const historyDialog = defineModel<boolean>("historyDialog", { required: true });
-const id = defineModel<string>("id", { required: true });
-const index = ref<number>(10);
-function closeHistoryDialog() {
-  historyDialog.value = false;
-}
-
-async function fetchHistoryData(id: string) {
-  showLoader();
-  await http
-    .get(config.API.profileNewFamilyHisByFamilyId(id))
-    .then(async (res) => {
-      historyRows.value = res.data.result;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-</script>
-
-<template>
-  <q-dialog v-model="historyDialog" class="dialog" persistent>
-    <q-card style="min-width: 70%" class="bg-white">
-      <q-card-section class="flex justify-between" style="padding: 0">
-        <dialog-header
-          tittle="ประวัติแก้ไขข้อมูลครอบครัว"
-          :close="closeHistoryDialog"
-        />
-      </q-card-section>
-      <q-separator color="grey-4" />
-      <div class="q-pa-md">
-        <div>
-          <div class="col-12 row q-pb-sm">
-            <div class="q-mr-md text-weight-bold text-primary text-subtitle1">
-              • บิดา
-            </div>
-          </div>
-          <q-card bordered class="bg-grey-1 q-gutter-md q-ma-none q-pb-md">
-            <div class="row items-center">
-              <div class="col-2">
-                <div>เลขบัตรประจำตัวประชาชน</div>
-              </div>
-              <div class="col">
-                {{ historyRows[index].fatherCitizenId }}
-              </div>
-            </div>
-            <div class="row items-center">
-              <div class="col-2">คำนำหน้าชื่อ</div>
-              <div class="col-2">
-                {{ historyRows[index].fatherPrefix }}
-              </div>
-              <div class="col-1">ชื่อ</div>
-              <div class="col-2">
-                {{ historyRows[index].fatherFirstName }}
-              </div>
-              <div class="col-1">นามสกุล</div>
-              <div class="col-2">
-                {{ historyRows[index].fatherLastName }}
-              </div>
-              <div class="col-1">อาชีพ</div>
-              <div class="col">
-                {{ historyRows[index].fatherCareer }}
-              </div>
-            </div>
-            <div class="row items-center">
-              <div class="col-2">สถานภาพการมีชีวิต</div>
-              <div class="col-10">
-                <div v-if="historyRows[index].fatherLive">มีชีวิตอยู่</div>
-                <div v-else>ถึงแก่กรรม</div>
-              </div>
-            </div>
-          </q-card>
-        </div>
-        <div>
-          <div class="col-12 row q-pb-sm q-pt-md">
-            <div class="q-mr-md text-weight-bold text-primary text-subtitle1">
-              • มารดา
-            </div>
-          </div>
-          <q-card bordered class="bg-grey-1 q-gutter-md q-ma-none q-pb-md">
-            <div class="row items-center">
-              <div class="col-2">
-                <div>เลขบัตรประจำตัวประชาชน</div>
-              </div>
-              <div class="col">
-                {{ historyRows[index].motherCitizenId }}
-              </div>
-            </div>
-            <div class="row items-center">
-              <div class="col-2">คำนำหน้าชื่อ</div>
-              <div class="col-2">
-                {{ historyRows[index].motherPrefix }}
-              </div>
-              <div class="col-1">ชื่อ</div>
-              <div class="col-2">
-                {{ historyRows[index].motherFirstName }}
-              </div>
-              <div class="col-1">นามสกุล</div>
-              <div class="col-2">
-                {{ historyRows[index].motherLastName }}
-              </div>
-              <div class="col-1">อาชีพ</div>
-              <div class="col">
-                {{ historyRows[index].motherCareer }}
-              </div>
-            </div>
-            <div class="row items-center">
-              <div class="col-2">สถานภาพการมีชีวิต</div>
-              <div class="col">
-                <div v-if="historyRows[index].motherLive">มีชีวิตอยู่</div>
-                <div v-else>ถึงแก่กรรม</div>
-              </div>
-            </div>
-          </q-card>
-        </div>
-        <div>
-          <div class="col-12 row q-pb-sm q-pt-md">
-            <div class="q-mr-md text-weight-bold text-primary text-subtitle1">
-              • คู่สมรส
-            </div>
-          </div>
-          <q-card bordered class="bg-grey-1 q-gutter-md q-ma-none q-pb-md">
-            <div class="row items-center">
-              <div class="col-2">
-                <div>เลขบัตรประจำตัวประชาชน</div>
-              </div>
-              <div class="col">
-                {{ historyRows[index].coupleCitizenId }}
-              </div>
-            </div>
-            <div class="row items-center">
-              <div class="col-2">คำนำหน้าชื่อ</div>
-              <div class="col-2">
-                {{ historyRows[index].couplePrefix }}
-              </div>
-              <div class="col-1">ชื่อ</div>
-              <div class="col-2">
-                {{ historyRows[index].firstName }}
-              </div>
-              <div class="col-1">นามสกุล</div>
-              <div class="col-2">
-                {{ historyRows[index].coupleLastName }}
-              </div>
-              <div class="col-1">อาชีพ</div>
-              <div class="col">
-                {{ historyRows[index].coupleCareer }}
-              </div>
-            </div>
-            <div class="row items-center">
-              <div class="col-2">สถานภาพการมีชีวิต</div>
-              <div class="col">
-                <div v-if="historyRows[index].coupleLive">มีชีวิตอยู่</div>
-                <div v-else>ถึงแก่กรรม</div>
-              </div>
-            </div>
-          </q-card>
-        </div>
-        <!-- <div>
-          <div class="col-12 row q-pb-sm q-pt-md">
-            <div class="q-mr-md text-weight-bold text-primary text-subtitle1">
-              • บุตร
-            </div>
-          </div>
-          <div
-            v-for="(children, indexIn) in historyRows[index].children"
-            :key="index"
-          >
-            <div class="col-12 row q-gutter-sm q-pb-xs q-mt-xs">
-              <div class="text-medium">บุตรคนที่ : {{ indexIn + 1 }}</div>
-            </div>
-            <q-card bordered class="bg-grey-1 q-gutter-md q-ma-none q-pb-md">
-              <div class="row items-center">
-                <div class="col-2">
-                  <div>เลขบัตรประจำตัวประชาชน</div>
-                </div>
-                <div class="col-10">
-                  {{ children.childrenCitizenId }}
-                </div>
-              </div>
-              <div class="row items-center">
-                <div class="col-2">คำนำหน้าชื่อ</div>
-                <div class="col-2">
-                  {{ children.childrenPrefix }}
-                </div>
-                <div class="col-1">ชื่อ</div>
-                <div class="col-2">
-                  {{ children.childrenFirstName }}
-                </div>
-                <div class="col-1">นามสกุล</div>
-                <div class="col-2">
-                  {{ children.childrenLastName }}
-                </div>
-                <div class="col-1">อาชีพ</div>
-                <div class="col">
-                  {{ children.childrenCareer }}
-                </div>
-              </div>
-              <div class="row items-center">
-                <div class="col-2">สถานภาพการมีชีวิต</div>
-                <div class="col">
-                  <div v-if="children.childrenLive">มีชีวิตอยู่</div>
-                  <div v-else>ถึงแก่กรรม</div>
-                </div>
-              </div>
-            </q-card>
-          </div>
-        </div> -->
-      </div>
-    </q-card>
-  </q-dialog>
-</template>