diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index 40a99c35e..35003b4b6 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -69,6 +69,8 @@ const goverment = reactive<Goverment>({
   positionLevel: "",
   positionExecutive: "",
   positionExecutiveSide: "",
+  dateLeave: "",
+  dateRetireLaw: "",
 });
 
 function calculateAge(birthDate: Date | null) {
@@ -172,6 +174,10 @@ async function fetchProfileGov(id: string) {
         data.posExecutive !== null ? data.posExecutive : "-";
       goverment.positionExecutiveSide =
         data.positionExecutiveField !== "" ? data.positionExecutiveField : "-";
+      goverment.dateLeave = !data.dateLeave ? "-" : date2Thai(data.dateLeave);
+      goverment.dateRetireLaw = !data.dateRetireLaw
+        ? "-"
+        : date2Thai(data.dateRetireLaw);
     })
 
     .catch((err) => {
@@ -311,46 +317,7 @@ async function fetchProfile(id: string, avatarName: string) {
                         label="เลขประจำตัวประชาชน"
                       ></q-input>
                     </div>
-                    <div class="col-xs-6 col-md-6">
-                      <q-input
-                        borderless
-                        readonly
-                        :model-value="
-                          imformation.prefix ? imformation.prefix : '-'
-                        "
-                        label="คำนำหน้าชื่อ"
-                      />
-                    </div>
-                    <div class="col-xs-6 col-md-6">
-                      <q-input
-                        borderless
-                        readonly
-                        :model-value="
-                          imformation.firstName ? imformation.firstName : '-'
-                        "
-                        label="ชื่่อ"
-                      />
-                    </div>
-                    <div class="col-xs-6 col-md-6">
-                      <q-input
-                        borderless
-                        readonly
-                        :model-value="
-                          imformation.lastName ? imformation.lastName : '-'
-                        "
-                        label="นามสกุล"
-                      />
-                    </div>
-                    <div class="col-xs-6 col-md-6">
-                      <q-input
-                        borderless
-                        readonly
-                        :model-value="
-                          imformation.birthDate ? imformation.birthDate : '-'
-                        "
-                        label="วัน/เดือน/ปีเกิด"
-                      />
-                    </div>
+
                     <div class="col-xs-6 col-md-6">
                       <q-input
                         borderless
@@ -361,6 +328,18 @@ async function fetchProfile(id: string, avatarName: string) {
                         label="เพศ"
                       />
                     </div>
+
+                    <div class="col-xs-6 col-md-6">
+                      <q-input
+                        borderless
+                        readonly
+                        :model-value="
+                          imformation.birthDate ? imformation.birthDate : '-'
+                        "
+                        label="วัน/เดือน/ปีเกิด"
+                      />
+                    </div>
+
                     <div class="col-xs-6 col-md-6">
                       <q-input
                         borderless
@@ -369,6 +348,30 @@ async function fetchProfile(id: string, avatarName: string) {
                         label="อายุ"
                       />
                     </div>
+
+                    <div class="col-xs-6 col-md-6">
+                      <q-input
+                        borderless
+                        readonly
+                        :model-value="
+                          goverment.dateLeave ? goverment.dateLeave : '-'
+                        "
+                        label="วันครบเกษียณอายุ"
+                      />
+                    </div>
+
+                    <div class="col-xs-6 col-md-6">
+                      <q-input
+                        borderless
+                        readonly
+                        :model-value="
+                          goverment.dateRetireLaw
+                            ? goverment.dateRetireLaw
+                            : '-'
+                        "
+                        label="วันที่เกษียณอายุราชการตามกฏหมาย"
+                      />
+                    </div>
                   </div>
                 </div>
               </q-card>
diff --git a/src/components/information/interface/response/Government.ts b/src/components/information/interface/response/Government.ts
index 82c7c9973..e99129ad8 100644
--- a/src/components/information/interface/response/Government.ts
+++ b/src/components/information/interface/response/Government.ts
@@ -30,6 +30,8 @@ interface Goverment {
   positionLevel: string;
   positionExecutive: string;
   positionExecutiveSide: string;
+  dateLeave: string;
+  dateRetireLaw: string;
 }
 
 export type { ResponseObject, Goverment };