diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 15ae7694..cf74a0d0 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -1053,7 +1053,7 @@ export class ProfileController extends Controller {
 
     const cert_raw = await this.certificateRepository.find({
       where: { profileId: id },
-      select: ["certificateType", "issuer", "certificateNo", "issueDate"],
+      select: ["certificateType", "issuer", "certificateNo", "issueDate", "expireDate"],
       order: { createdAt: "ASC" },
     });
     const certs =
@@ -1064,15 +1064,17 @@ export class ProfileController extends Controller {
             certificateNo: item.certificateNo ? Extension.ToThaiNumber(item.certificateNo) : null,
             issueDate: item.issueDate
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate))
-              : null,
+              : "",
             expireDate: item.expireDate
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate))
-              : null,
+              : "",
             issueToExpireDate: item.issueDate
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate))
-              : "" + item.expireDate
-                ? " - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate))
-                : null,
+              ? item.expireDate 
+                ? Extension.ToThaiNumber(`${Extension.ToThaiFullDate2(item.issueDate)} - ${Extension.ToThaiFullDate2(item.expireDate)}`)
+                : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate))
+              : item.expireDate
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate))
+                : ""
           }))
         : [
             {
@@ -1153,6 +1155,21 @@ export class ProfileController extends Controller {
             },
           ];
     const salary_raw = await this.salaryRepo.find({
+      select: [
+        "commandName",
+        "commandDateAffect",
+        "positionName",
+        "posNoAbb",
+        "posNo",
+        "amount",
+        "amountSpecial",
+        "positionLevel",
+        "positionCee",
+        "remark",
+        "positionType",
+        "positionSalaryAmount",
+        "order",
+      ],
       where: {
         profileId: id,
         commandCode: In(["5", "6"]),
@@ -1218,6 +1235,17 @@ export class ProfileController extends Controller {
           ];
 
     const insignia_raw = await this.profileInsigniaRepo.find({
+      select: [
+        "receiveDate",
+        "no",
+        "issue",
+        "volumeNo",
+        "volume",
+        "section",
+        "page",
+        "refCommandDate",
+        "note",
+      ],
       relations: {
         insignia: {
           insigniaType: true,
@@ -1232,9 +1260,9 @@ export class ProfileController extends Controller {
             receiveDate: item.receiveDate
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.receiveDate))
               : "",
-            insigniaName: item.insignia.name,
-            insigniaShortName: item.insignia.shortName,
-            insigniaTypeName: item.insignia.insigniaType.name,
+            insigniaName: item.insignia?.name ?? "",
+            insigniaShortName: item.insignia?.shortName ?? "",
+            insigniaTypeName: item.insignia?.insigniaType?.name ?? "",
             no: item.no ? Extension.ToThaiNumber(item.no) : "",
             issue: item.issue ? Extension.ToThaiNumber(item.issue) : "",
             volumeNo: item.volumeNo ? Extension.ToThaiNumber(item.volumeNo) : "",
@@ -1293,7 +1321,9 @@ export class ProfileController extends Controller {
           const totalLeaveDaysKey = `totalLeaveDaysLv${lvIndex}`;
           const leaveTypeNameKey = `leaveTypeNameLv${lvIndex}`;
 
-          const leaveDate = new Date(item.maxDateLeaveStart);
+          const leaveDate = item.maxDateLeaveStart 
+            ? new Date(item.maxDateLeaveStart) 
+            : null;
           const year = leaveDate
             ? Extension.ToThaiNumber(Extension.ToThaiShortYear(leaveDate))
             : "";
@@ -1487,11 +1517,14 @@ export class ProfileController extends Controller {
     const _actposition =
       actposition_raw.length > 0
         ? actposition_raw.map((item) => ({
-            date: item.dateStart
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
-              : "" + item.dateEnd
-                ? " - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
-                : "",
+            date:
+              item.dateStart && item.dateEnd
+                ? Extension.ToThaiNumber(`${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`)
+                : item.dateStart
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
+                  : item.dateEnd
+                    ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
+                    : "",
             position: item.position ? Extension.ToThaiNumber(item.position) : "",
             commandName: "รักษาการในตำแหน่ง",
             agency: "",
@@ -1509,11 +1542,14 @@ export class ProfileController extends Controller {
     const _assistance =
       assistance_raw.length > 0
         ? assistance_raw.map((item) => ({
-            date: item.dateStart
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
-              : "" + item.dateEnd
-                ? " - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
-                : "",
+            date:
+              item.dateStart && item.dateEnd
+                ? Extension.ToThaiNumber(`${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`)
+                : item.dateStart
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
+                  : item.dateEnd
+                    ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
+                    : "",
             position: "",
             commandName: item.commandName ? Extension.ToThaiNumber(item.commandName) : "",
             agency: item.agency ? Extension.ToThaiNumber(item.agency) : "",
@@ -1536,11 +1572,14 @@ export class ProfileController extends Controller {
     const duty =
       duty_raw.length > 0
         ? duty_raw.map((item) => ({
-            date: item.dateStart
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
-              : "" + item.dateEnd
-                ? " - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
-                : "",
+            date:
+              item.dateStart && item.dateEnd
+                ? Extension.ToThaiNumber(`${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`)
+                : item.dateStart
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
+                  : item.dateEnd
+                    ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
+                    : "",
             refCommandDate: item.refCommandDate
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.refCommandDate))
               : "",
@@ -1813,7 +1852,9 @@ export class ProfileController extends Controller {
           ? Extension.ToThaiNumber(profiles.registrationZipCode)
           : "",
       fullRegistrationAddress: fullRegistrationAddress,
-      updateAt: Extension.ToThaiNumber(Extension.ToThaiFullDate2(profiles.lastUpdatedAt)),
+      updateAt: profiles.lastUpdatedAt 
+        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(profiles.lastUpdatedAt))
+        : "",
       telephone: profiles.phone != null ? Extension.ToThaiNumber(profiles.phone) : "",
       url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_MGT}`,
       url1: _ImgUrl[0] ? _ImgUrl[0] : null,
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index ed993152..0206bf36 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -1049,7 +1049,7 @@ export class ProfileEmployeeController extends Controller {
 
     const cert_raw = await this.certificateRepository.find({
       where: { profileEmployeeId: id },
-      select: ["certificateType", "issuer", "certificateNo", "issueDate"],
+      select: ["certificateType", "issuer", "certificateNo", "issueDate", "expireDate"],
       order: { createdAt: "ASC" },
     });
     const certs =
@@ -1060,15 +1060,17 @@ export class ProfileEmployeeController extends Controller {
             certificateNo: item.certificateNo ? Extension.ToThaiNumber(item.certificateNo) : null,
             issueDate: item.issueDate
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate))
-              : null,
+              : "",
             expireDate: item.expireDate
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate))
-              : null,
+              : "",
             issueToExpireDate: item.issueDate
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate))
-              : "" + item.expireDate
-                ? " - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate))
-                : null,
+              ? item.expireDate 
+                ? Extension.ToThaiNumber(`${Extension.ToThaiFullDate2(item.issueDate)} - ${Extension.ToThaiFullDate2(item.expireDate)}`)
+                : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate))
+              : item.expireDate
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate))
+                : ""
           }))
         : [
             {
@@ -1149,6 +1151,21 @@ export class ProfileEmployeeController extends Controller {
             },
           ];
     const salary_raw = await this.salaryRepo.find({
+      select: [
+        "commandName",
+        "commandDateAffect",
+        "positionName",
+        "posNoAbb",
+        "posNo",
+        "amount",
+        "amountSpecial",
+        "positionLevel",
+        "positionCee",
+        "remark",
+        "positionType",
+        "positionSalaryAmount",
+        "order",
+      ],
       where: {
         profileEmployeeId: id,
         commandCode: In(["5", "6"]),
@@ -1214,6 +1231,17 @@ export class ProfileEmployeeController extends Controller {
           ];
 
     const insignia_raw = await this.profileInsigniaRepo.find({
+      select: [
+        "receiveDate",
+        "no",
+        "issue",
+        "volumeNo",
+        "volume",
+        "section",
+        "page",
+        "refCommandDate",
+        "note",
+      ],
       relations: {
         insignia: {
           insigniaType: true,
@@ -1228,9 +1256,9 @@ export class ProfileEmployeeController extends Controller {
             receiveDate: item.receiveDate
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.receiveDate))
               : "",
-            insigniaName: item.insignia.name,
-            insigniaShortName: item.insignia.shortName,
-            insigniaTypeName: item.insignia.insigniaType.name,
+            insigniaName: item.insignia?.name ?? "",
+            insigniaShortName: item.insignia?.shortName ?? "",
+            insigniaTypeName: item.insignia?.insigniaType?.name ?? "",
             no: item.no ? Extension.ToThaiNumber(item.no) : "",
             issue: item.issue ? Extension.ToThaiNumber(item.issue) : "",
             volumeNo: item.volumeNo ? Extension.ToThaiNumber(item.volumeNo) : "",
@@ -1289,7 +1317,9 @@ export class ProfileEmployeeController extends Controller {
           const totalLeaveDaysKey = `totalLeaveDaysLv${lvIndex}`;
           const leaveTypeNameKey = `leaveTypeNameLv${lvIndex}`;
 
-          const leaveDate = new Date(item.maxDateLeaveStart);
+          const leaveDate = item.maxDateLeaveStart 
+            ? new Date(item.maxDateLeaveStart) 
+            : null;
           const year = leaveDate
             ? Extension.ToThaiNumber(Extension.ToThaiShortYear(leaveDate))
             : "";
@@ -1483,11 +1513,14 @@ export class ProfileEmployeeController extends Controller {
     const _actposition =
       actposition_raw.length > 0
         ? actposition_raw.map((item) => ({
-            date: item.dateStart
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
-              : "" + item.dateEnd
-                ? " - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
-                : "",
+            date:
+              item.dateStart && item.dateEnd
+                ? Extension.ToThaiNumber(`${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`)
+                : item.dateStart
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
+                  : item.dateEnd
+                    ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
+                    : "",
             position: item.position ? Extension.ToThaiNumber(item.position) : "",
             commandName: "รักษาการในตำแหน่ง",
             agency: "",
@@ -1505,11 +1538,14 @@ export class ProfileEmployeeController extends Controller {
     const _assistance =
       assistance_raw.length > 0
         ? assistance_raw.map((item) => ({
-            date: item.dateStart
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
-              : "" + item.dateEnd
-                ? " - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
-                : "",
+            date:
+              item.dateStart && item.dateEnd
+                ? Extension.ToThaiNumber(`${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`)
+                : item.dateStart
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
+                  : item.dateEnd
+                    ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
+                    : "",
             position: "",
             commandName: item.commandName ? Extension.ToThaiNumber(item.commandName) : "",
             agency: item.agency ? Extension.ToThaiNumber(item.agency) : "",
@@ -1532,11 +1568,14 @@ export class ProfileEmployeeController extends Controller {
     const duty =
       duty_raw.length > 0
         ? duty_raw.map((item) => ({
-            date: item.dateStart
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
-              : "" + item.dateEnd
-                ? " - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
-                : "",
+            date:
+              item.dateStart && item.dateEnd
+                ? Extension.ToThaiNumber(`${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`)
+                : item.dateStart
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
+                  : item.dateEnd
+                    ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
+                    : "",
             refCommandDate: item.refCommandDate
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.refCommandDate))
               : "",
@@ -1791,7 +1830,9 @@ export class ProfileEmployeeController extends Controller {
           ? Extension.ToThaiNumber(profiles.registrationZipCode)
           : "",
       fullRegistrationAddress: fullRegistrationAddress,
-      updateAt: Extension.ToThaiNumber(Extension.ToThaiFullDate2(profiles.lastUpdatedAt)),
+      updateAt: profiles.lastUpdatedAt 
+        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(profiles.lastUpdatedAt))
+        : "",
       telephone: profiles.phone != null ? Extension.ToThaiNumber(profiles.phone) : "",
       url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_MGT}`,
       url1: _ImgUrl[0] ? _ImgUrl[0] : null,