diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index d9adde3..f44c2e2 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -252,8 +252,8 @@ export class ReportController extends Controller {
       where: {
         rootId: rootId,
         salaryPeriodId: salaryPeriodId,
-      }
-    })
+      },
+    });
     const root = _root?.root == null ? "" : _root.root;
     // const agency = _salaryPeriod[0] == null ? "" : _salaryPeriod[0].root;
 
@@ -276,7 +276,8 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -327,16 +328,16 @@ export class ReportController extends Controller {
       let formattedData1;
       if (data1 != null) {
         formattedData1 = {
-          total: Extension.ToThaiNumber(data1.total.toString()),
-          fifteenPercent: Extension.ToThaiNumber(data1.fifteenPercent.toString()),
+          total: Extension.ToThaiNumber(data1.total.toLocaleString()),
+          fifteenPercent: Extension.ToThaiNumber(data1.fifteenPercent.toLocaleString()),
           full: Extension.ToThaiNumber(
-            data1.salaryProfiles.filter((x) => x.type == "FULL").length.toString(),
+            data1.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
           ),
           haft: Extension.ToThaiNumber(
-            data1.salaryProfiles.filter((x) => x.type == "HAFT").length.toString(),
+            data1.salaryProfiles.filter((x) => x.type == "HAFT").length.toLocaleString(),
           ),
           notPromoted: Extension.ToThaiNumber(
-            data1.salaryProfiles.filter((x) => x.type == "NONE").length.toString(),
+            data1.salaryProfiles.filter((x) => x.type == "NONE").length.toLocaleString(),
           ),
           reason: null,
         };
@@ -345,8 +346,8 @@ export class ReportController extends Controller {
       let formattedData2;
       if (data2 != null) {
         formattedData2 = {
-          total: Extension.ToThaiNumber(data2.total.toString()),
-          fifteenPercent: Extension.ToThaiNumber(data2.fifteenPercent.toString()),
+          total: Extension.ToThaiNumber(data2.total.toLocaleString()),
+          fifteenPercent: Extension.ToThaiNumber(data2.fifteenPercent.toLocaleString()),
           full: Extension.ToThaiNumber(
             data2.salaryProfiles
               .filter(
@@ -356,7 +357,7 @@ export class ReportController extends Controller {
                   (x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
               )
               .filter((x) => x.type == "FULL")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           haft: Extension.ToThaiNumber(
             data2.salaryProfiles
@@ -367,7 +368,7 @@ export class ReportController extends Controller {
                   (x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
               )
               .filter((x) => x.type == "HAFT")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           notPromoted: Extension.ToThaiNumber(
             data2.salaryProfiles
@@ -378,7 +379,7 @@ export class ReportController extends Controller {
                   (x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
               )
               .filter((x) => x.type == "NONE")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           reason: null,
         };
@@ -387,8 +388,8 @@ export class ReportController extends Controller {
       let formattedData3;
       if (data3 != null) {
         formattedData3 = {
-          total: Extension.ToThaiNumber(data3.total.toString()),
-          fifteenPercent: Extension.ToThaiNumber(data3.fifteenPercent.toString()),
+          total: Extension.ToThaiNumber(data3.total.toLocaleString()),
+          fifteenPercent: Extension.ToThaiNumber(data3.fifteenPercent.toLocaleString()),
           full: Extension.ToThaiNumber(
             data3.salaryProfiles
               .filter(
@@ -399,7 +400,7 @@ export class ReportController extends Controller {
                   x.posLevel == "ชำนาญการ",
               )
               .filter((x) => x.type == "FULL")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           haft: Extension.ToThaiNumber(
             data3.salaryProfiles
@@ -411,7 +412,7 @@ export class ReportController extends Controller {
                   x.posLevel == "ชำนาญการ",
               )
               .filter((x) => x.type == "HAFT")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           notPromoted: Extension.ToThaiNumber(
             data3.salaryProfiles
@@ -423,7 +424,7 @@ export class ReportController extends Controller {
                   x.posLevel == "ชำนาญการ",
               )
               .filter((x) => x.type == "NONE")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           reason: null,
         };
@@ -432,16 +433,16 @@ export class ReportController extends Controller {
       let formattedData4;
       if (data4 != null) {
         formattedData4 = {
-          total: Extension.ToThaiNumber(data4.total.toString()),
-          fifteenPercent: Extension.ToThaiNumber(data4.fifteenPercent.toString()),
+          total: Extension.ToThaiNumber(data4.total.toLocaleString()),
+          fifteenPercent: Extension.ToThaiNumber(data4.fifteenPercent.toLocaleString()),
           full: Extension.ToThaiNumber(
-            data4.salaryProfiles.filter((x) => x.type == "FULL").length.toString(),
+            data4.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
           ),
           haft: Extension.ToThaiNumber(
-            data4.salaryProfiles.filter((x) => x.type == "HAFT").length.toString(),
+            data4.salaryProfiles.filter((x) => x.type == "HAFT").length.toLocaleString(),
           ),
           notPromoted: Extension.ToThaiNumber(
-            data4.salaryProfiles.filter((x) => x.type == "NONE").length.toString(),
+            data4.salaryProfiles.filter((x) => x.type == "NONE").length.toLocaleString(),
           ),
           reason: null,
         };
@@ -455,7 +456,7 @@ export class ReportController extends Controller {
             Extension.ToThaiFullDate(new Date(`${salaryPeriod.year}-03-01`)),
           ),
           year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
-          dateNow: Extension.ToThaiNumber(Extension.ToThaiFullDate(new Date())),
+          dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
           agency: agency,
           data1: formattedData1,
           data2: formattedData2,
@@ -475,6 +476,7 @@ export class ReportController extends Controller {
             year: salaryPeriod.year,
           },
         },
+        relations: { salaryProfiles: true },
       });
       const _salaryPeriodAPR2 = await this.salaryOrgRepository.findOne({
         where: {
@@ -486,6 +488,7 @@ export class ReportController extends Controller {
             year: salaryPeriod.year,
           },
         },
+        relations: { salaryProfiles: true },
       });
       let formattedData1;
       if (data1 != null) {
@@ -518,35 +521,38 @@ export class ReportController extends Controller {
             );
           }, 0);
         formattedData1 = {
-          totalSalary: Extension.ToThaiNumber(data1.currentAmount.toString()),
-          totalUser: Extension.ToThaiNumber(data1.total.toString()),
-          sixPercentAmount: Extension.ToThaiNumber(data1.sixPercentAmount.toString()),
-          spentAmount: Extension.ToThaiNumber(data1.spentAmount.toString()),
-          remainingAmount: Extension.ToThaiNumber(
-            (data1.sixPercentAmount - data1.spentAmount).toString(),
-          ),
+          totalSalary: Extension.ToThaiNumber(data1.currentAmount.toLocaleString()),
+          totalUser: Extension.ToThaiNumber(data1.total.toLocaleString()),
+          sixPercentAmount: Extension.ToThaiNumber(data1.sixPercentAmount.toLocaleString()),
+          spentAmount: Extension.ToThaiNumber(data1.spentAmount.toLocaleString()),
+          remainingAmount: Extension.ToThaiNumber(data1.remainingAmount.toLocaleString()),
           fifteenPercentOld: Extension.ToThaiNumber(
-            (_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPercent).toString(),
+            (_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPercent).toLocaleString(),
           ),
           totalOld: Extension.ToThaiNumber(
-            (_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.total).toString(),
+            (_salaryPeriodAPR2 == null || _salaryPeriodAPR2.salaryProfiles.length == 0
+              ? 0
+              : _salaryPeriodAPR2.salaryProfiles.filter((x) => x.type == "FULL").length
+            ).toLocaleString(),
           ),
           haft: Extension.ToThaiNumber(
-            data1.salaryProfiles.filter((x) => x.type == "HAFT").length.toString(),
+            data1.salaryProfiles.filter((x) => x.type == "HAFT").length.toLocaleString(),
           ),
           full: Extension.ToThaiNumber(
-            data1.salaryProfiles.filter((x) => x.type == "FULL").length.toString(),
+            data1.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
           ),
           fullHaft: Extension.ToThaiNumber(
             data1.salaryProfiles.filter((x) => x.type == "FULLHAFT").length.toString(),
           ),
           notPromoted: Extension.ToThaiNumber(
-            data1.salaryProfiles.filter((x) => x.type == "NONE").length.toString(),
+            data1.salaryProfiles.filter((x) => x.type == "NONE").length.toLocaleString(),
+          ),
+          haftSalary: Extension.ToThaiNumber(haftSalary.toLocaleString()),
+          fullSalary: Extension.ToThaiNumber(fullSalary.toLocaleString()),
+          fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toLocaleString()),
+          total: Extension.ToThaiNumber(
+            (haftSalary + fullSalary + fullHaftSalary).toLocaleString(),
           ),
-          haftSalary: Extension.ToThaiNumber(haftSalary.toString()),
-          fullSalary: Extension.ToThaiNumber(fullSalary.toString()),
-          fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toString()),
-          total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toString()),
           summary: Extension.ToThaiNumber(
             (
               data1.sixPercentAmount -
@@ -554,7 +560,7 @@ export class ReportController extends Controller {
               haftSalary -
               fullSalary -
               fullHaftSalary
-            ).toString(),
+            ).toLocaleString(),
           ),
           reason: null,
         };
@@ -610,18 +616,26 @@ export class ReportController extends Controller {
           }, 0);
 
         formattedData2 = {
-          totalSalary: Extension.ToThaiNumber(data2.currentAmount.toString()),
-          totalUser: Extension.ToThaiNumber(data2.total.toString()),
-          sixPercentAmount: Extension.ToThaiNumber(data2.sixPercentAmount.toString()),
-          spentAmount: Extension.ToThaiNumber(data2.spentAmount.toString()),
-          remainingAmount: Extension.ToThaiNumber(
-            (data2.sixPercentAmount - data2.spentAmount).toString(),
-          ),
+          totalSalary: Extension.ToThaiNumber(data2.currentAmount.toLocaleString()),
+          totalUser: Extension.ToThaiNumber(data2.total.toLocaleString()),
+          sixPercentAmount: Extension.ToThaiNumber(data2.sixPercentAmount.toLocaleString()),
+          spentAmount: Extension.ToThaiNumber(data2.spentAmount.toLocaleString()),
+          remainingAmount: Extension.ToThaiNumber(data2.remainingAmount.toLocaleString()),
           fifteenPercentOld: Extension.ToThaiNumber(
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toString(),
+            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
           ),
           totalOld: Extension.ToThaiNumber(
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toString(),
+            (_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
+              ? 0
+              : _salaryPeriodAPR1.salaryProfiles
+                  .filter(
+                    (x) =>
+                      x.posLevel == "อาวุโส" ||
+                      x.posLevel == "ชำนาญการพิเศษ" ||
+                      (x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
+                  )
+                  .filter((x) => x.type == "FULL").length
+            ).toLocaleString(),
           ),
           haft: Extension.ToThaiNumber(
             data2.salaryProfiles
@@ -632,7 +646,7 @@ export class ReportController extends Controller {
                   (x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
               )
               .filter((x) => x.type == "HAFT")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           full: Extension.ToThaiNumber(
             data2.salaryProfiles
@@ -643,7 +657,7 @@ export class ReportController extends Controller {
                   (x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
               )
               .filter((x) => x.type == "FULL")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           fullHaft: Extension.ToThaiNumber(
             data2.salaryProfiles
@@ -654,7 +668,7 @@ export class ReportController extends Controller {
                   (x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
               )
               .filter((x) => x.type == "FULLHAFT")
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           notPromoted: Extension.ToThaiNumber(
             data2.salaryProfiles
@@ -665,12 +679,14 @@ export class ReportController extends Controller {
                   (x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
               )
               .filter((x) => x.type == "NONE")
-              .length.toString(),
+              .length.toLocaleString(),
+          ),
+          haftSalary: Extension.ToThaiNumber(haftSalary.toLocaleString()),
+          fullSalary: Extension.ToThaiNumber(fullSalary.toLocaleString()),
+          fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toLocaleString()),
+          total: Extension.ToThaiNumber(
+            (haftSalary + fullSalary + fullHaftSalary).toLocaleString(),
           ),
-          haftSalary: Extension.ToThaiNumber(haftSalary.toString()),
-          fullSalary: Extension.ToThaiNumber(fullSalary.toString()),
-          fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toString()),
-          total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toString()),
           summary: Extension.ToThaiNumber(
             (
               data2.sixPercentAmount -
@@ -678,7 +694,7 @@ export class ReportController extends Controller {
               haftSalary -
               fullSalary -
               fullHaftSalary
-            ).toString(),
+            ).toLocaleString(),
           ),
           reason: null,
         };
@@ -736,18 +752,27 @@ export class ReportController extends Controller {
             );
           }, 0);
         formattedData3 = {
-          totalSalary: Extension.ToThaiNumber(data3.currentAmount.toString()),
-          totalUser: Extension.ToThaiNumber(data3.total.toString()),
-          sixPercentAmount: Extension.ToThaiNumber(data3.sixPercentAmount.toString()),
-          spentAmount: Extension.ToThaiNumber(data3.spentAmount.toString()),
-          remainingAmount: Extension.ToThaiNumber(
-            (data3.sixPercentAmount - data3.spentAmount).toString(),
-          ),
+          totalSalary: Extension.ToThaiNumber(data3.currentAmount.toLocaleString()),
+          totalUser: Extension.ToThaiNumber(data3.total.toLocaleString()),
+          sixPercentAmount: Extension.ToThaiNumber(data3.sixPercentAmount.toLocaleString()),
+          spentAmount: Extension.ToThaiNumber(data3.spentAmount.toLocaleString()),
+          remainingAmount: Extension.ToThaiNumber(data3.remainingAmount.toLocaleString()),
           fifteenPercentOld: Extension.ToThaiNumber(
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toString(),
+            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
           ),
           totalOld: Extension.ToThaiNumber(
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toString(),
+            (_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
+              ? 0
+              : _salaryPeriodAPR1.salaryProfiles
+                  .filter((x) => x.type == "FULL")
+                  .filter(
+                    (x) =>
+                      x.posLevel == "ปฏิบัติงาน" ||
+                      x.posLevel == "ชำนาญงาน" ||
+                      x.posLevel == "ปฏิบัติการ" ||
+                      x.posLevel == "ชำนาญการ",
+                  ).length
+            ).toLocaleString(),
           ),
           haft: Extension.ToThaiNumber(
             data3.salaryProfiles
@@ -759,7 +784,7 @@ export class ReportController extends Controller {
                   x.posLevel == "ปฏิบัติการ" ||
                   x.posLevel == "ชำนาญการ",
               )
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           full: Extension.ToThaiNumber(
             data3.salaryProfiles
@@ -771,7 +796,7 @@ export class ReportController extends Controller {
                   x.posLevel == "ปฏิบัติการ" ||
                   x.posLevel == "ชำนาญการ",
               )
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           fullHaft: Extension.ToThaiNumber(
             data3.salaryProfiles
@@ -783,7 +808,7 @@ export class ReportController extends Controller {
                   x.posLevel == "ปฏิบัติการ" ||
                   x.posLevel == "ชำนาญการ",
               )
-              .length.toString(),
+              .length.toLocaleString(),
           ),
           notPromoted: Extension.ToThaiNumber(
             data3.salaryProfiles
@@ -795,12 +820,14 @@ export class ReportController extends Controller {
                   x.posLevel == "ปฏิบัติการ" ||
                   x.posLevel == "ชำนาญการ",
               )
-              .length.toString(),
+              .length.toLocaleString(),
+          ),
+          haftSalary: Extension.ToThaiNumber(haftSalary.toLocaleString()),
+          fullSalary: Extension.ToThaiNumber(fullSalary.toLocaleString()),
+          fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toLocaleString()),
+          total: Extension.ToThaiNumber(
+            (haftSalary + fullSalary + fullHaftSalary).toLocaleString(),
           ),
-          haftSalary: Extension.ToThaiNumber(haftSalary.toString()),
-          fullSalary: Extension.ToThaiNumber(fullSalary.toString()),
-          fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toString()),
-          total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toString()),
           summary: Extension.ToThaiNumber(
             (
               data3.sixPercentAmount -
@@ -808,7 +835,7 @@ export class ReportController extends Controller {
               haftSalary -
               fullSalary -
               fullHaftSalary
-            ).toString(),
+            ).toLocaleString(),
           ),
           reason: null,
         };
@@ -845,35 +872,38 @@ export class ReportController extends Controller {
             );
           }, 0);
         formattedData4 = {
-          totalSalary: Extension.ToThaiNumber(data4.currentAmount.toString()),
-          totalUser: Extension.ToThaiNumber(data4.total.toString()),
-          sixPercentAmount: Extension.ToThaiNumber(data4.sixPercentAmount.toString()),
-          spentAmount: Extension.ToThaiNumber(data4.spentAmount.toString()),
-          remainingAmount: Extension.ToThaiNumber(
-            (data4.sixPercentAmount - data4.spentAmount).toString(),
-          ),
+          totalSalary: Extension.ToThaiNumber(data4.currentAmount.toLocaleString()),
+          totalUser: Extension.ToThaiNumber(data4.total.toLocaleString()),
+          sixPercentAmount: Extension.ToThaiNumber(data4.sixPercentAmount.toLocaleString()),
+          spentAmount: Extension.ToThaiNumber(data4.spentAmount.toLocaleString()),
+          remainingAmount: Extension.ToThaiNumber(data4.remainingAmount.toLocaleString()),
           fifteenPercentOld: Extension.ToThaiNumber(
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toString(),
+            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
           ),
           totalOld: Extension.ToThaiNumber(
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toString(),
+            (_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
+              ? 0
+              : _salaryPeriodAPR1.salaryProfiles.filter((x) => x.type == "FULL").length
+            ).toLocaleString(),
           ),
           haft: Extension.ToThaiNumber(
-            data4.salaryProfiles.filter((x) => x.type == "HAFT").length.toString(),
+            data4.salaryProfiles.filter((x) => x.type == "HAFT").length.toLocaleString(),
           ),
           full: Extension.ToThaiNumber(
-            data4.salaryProfiles.filter((x) => x.type == "FULL").length.toString(),
+            data4.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
           ),
           fullHaft: Extension.ToThaiNumber(
-            data4.salaryProfiles.filter((x) => x.type == "FULLHAFT").length.toString(),
+            data4.salaryProfiles.filter((x) => x.type == "FULLHAFT").length.toLocaleString(),
           ),
           notPromoted: Extension.ToThaiNumber(
-            data4.salaryProfiles.filter((x) => x.type == "NONE").length.toString(),
+            data4.salaryProfiles.filter((x) => x.type == "NONE").length.toLocaleString(),
+          ),
+          haftSalary: Extension.ToThaiNumber(haftSalary.toLocaleString()),
+          fullSalary: Extension.ToThaiNumber(fullSalary.toLocaleString()),
+          fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toLocaleString()),
+          total: Extension.ToThaiNumber(
+            (haftSalary + fullSalary + fullHaftSalary).toLocaleString(),
           ),
-          haftSalary: Extension.ToThaiNumber(haftSalary.toString()),
-          fullSalary: Extension.ToThaiNumber(fullSalary.toString()),
-          fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toString()),
-          total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toString()),
           summary: Extension.ToThaiNumber(
             (
               data4.sixPercentAmount -
@@ -881,7 +911,7 @@ export class ReportController extends Controller {
               haftSalary -
               fullSalary -
               fullHaftSalary
-            ).toString(),
+            ).toLocaleString(),
           ),
           reason: null,
         };
@@ -895,7 +925,7 @@ export class ReportController extends Controller {
             Extension.ToThaiFullDate(new Date(`${salaryPeriod.year}-03-01`)),
           ),
           year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
-          dateNow: Extension.ToThaiNumber(Extension.ToThaiFullDate(new Date())),
+          dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
           agency: agency,
           data1: formattedData1,
           data2: formattedData2,
@@ -1126,7 +1156,9 @@ export class ReportController extends Controller {
               " " +
               item.lastName, // สังกัด/ชื่อ-นามสกุล
             posLevel: item.posLevel,
-            posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
+            posMasterNo:
+              Extension.ToThaiNumber(item.orgShortName) +
+              Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
             amount:
               item.amount == undefined || item.amount == null
                 ? "๐"
@@ -1172,7 +1204,9 @@ export class ReportController extends Controller {
               " " +
               item.lastName, // สังกัด/ชื่อ-นามสกุล
             posLevel: item.posLevel,
-            posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
+            posMasterNo:
+              Extension.ToThaiNumber(item.orgShortName) +
+              Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
             amount:
               item.amount == undefined || item.amount == null
                 ? "๐"
@@ -1426,7 +1460,9 @@ export class ReportController extends Controller {
               " " +
               item.lastName, // สังกัด/ชื่อ-นามสกุล
             posLevel: item.posLevel,
-            posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
+            posMasterNo:
+              Extension.ToThaiNumber(item.orgShortName) +
+              Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
             amount:
               item.amount == undefined || item.amount == null
                 ? "๐"
@@ -1485,7 +1521,9 @@ export class ReportController extends Controller {
               " " +
               item.lastName, // สังกัด/ชื่อ-นามสกุล
             posLevel: item.posLevel,
-            posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
+            posMasterNo:
+              Extension.ToThaiNumber(item.orgShortName) +
+              Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
             amount:
               item.amount == undefined || item.amount == null
                 ? "๐"
@@ -1563,7 +1601,7 @@ export class ReportController extends Controller {
           rootId: rootId,
           salaryPeriodId: salaryPeriodId,
         },
-        type: "NONE", //ไม่ได้เลื่อน
+        type: In(["HAFT", "FULL", "FULLHAFT"]),
         isRetired: false, //กรองเฉพาะคนที่ไม่เกษียณ
       },
       order: {
@@ -1579,8 +1617,8 @@ export class ReportController extends Controller {
       where: {
         rootId: rootId,
         salaryPeriodId: salaryPeriodId,
-      }
-    })
+      },
+    });
     const root = _root?.root == null ? "" : _root.root;
     // const agency = _salaryPeriod[0] == null ? "" : _salaryPeriod[0].root;
 
@@ -1600,7 +1638,9 @@ export class ReportController extends Controller {
           (profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
-        orgShortName: Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString())),
+        orgShortName:
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString())),
         amount:
           profile.amount == undefined || profile.amount == null || profile.amount == 0
             ? ""
@@ -1665,7 +1705,7 @@ export class ReportController extends Controller {
           rootId: rootId,
           salaryPeriodId: salaryPeriodId,
         },
-        type: "NONE", //ไม่ได้เลื่อน
+        type: In(["HAFT", "FULL", "FULLHAFT"]),
         isRetired: true, //กรองเฉพาะคนที่เกษียณ
       },
       order: {
@@ -1681,8 +1721,8 @@ export class ReportController extends Controller {
       where: {
         rootId: rootId,
         salaryPeriodId: salaryPeriodId,
-      }
-    })
+      },
+    });
     const root = _root?.root == null ? "" : _root.root;
     // const agency = _salaryPeriod[0] == null ? "" : _salaryPeriod[0].root;
 
@@ -1702,7 +1742,9 @@ export class ReportController extends Controller {
           (profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
-        orgShortName: Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString())),
+        orgShortName:
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString())),
         amount:
           profile.amount == undefined || profile.amount == null || profile.amount == 0
             ? ""
@@ -1782,8 +1824,8 @@ export class ReportController extends Controller {
       where: {
         rootId: rootId,
         salaryPeriodId: salaryPeriodId,
-      }
-    })
+      },
+    });
     const root = _root?.root == null ? "" : _root.root;
     // const agency = _salaryPeriod[0] == null ? "" : _salaryPeriod[0].root;
 
@@ -1807,7 +1849,8 @@ export class ReportController extends Controller {
         position: position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null, //เหตุผล
         score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
@@ -1869,8 +1912,8 @@ export class ReportController extends Controller {
       where: {
         rootId: rootId,
         salaryPeriodId: salaryPeriodId,
-      }
-    })
+      },
+    });
     const root = _root?.root == null ? "" : _root.root;
     // const agency = _salaryPeriod[0] == null ? "" : _salaryPeriod[0].root;
 
@@ -1894,7 +1937,8 @@ export class ReportController extends Controller {
         position: position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null, //เหตุผล
         score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
@@ -1966,8 +2010,8 @@ export class ReportController extends Controller {
       where: {
         rootId: rootId,
         salaryPeriodId: salaryPeriodId,
-      }
-    })
+      },
+    });
     const root = _root?.root == null ? "" : _root.root;
     // const agency = salaryProfile[0] == null ? "" : salaryProfile[0].root;
 
@@ -1984,7 +2028,9 @@ export class ReportController extends Controller {
         (item.root == undefined && item.root == null ? "" : item.root),
       posType: item.posType,
       posLevel: item.posLevel,
-      posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
+      posMasterNo:
+        Extension.ToThaiNumber(item.orgShortName) +
+        Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
       amount:
         item.amount == undefined || item.amount == null
           ? "๐"
@@ -2045,7 +2091,7 @@ export class ReportController extends Controller {
         salaryPeriodId: salaryPeriodId,
         rootId: rootId,
         snapshot: "SNAP2",
-        group: "GROUP1"
+        group: "GROUP1",
       },
       relations: ["salaryProfiles"],
     });
@@ -2054,7 +2100,7 @@ export class ReportController extends Controller {
         salaryPeriodId: salaryPeriodId,
         rootId: rootId,
         snapshot: "SNAP2",
-        group: "GROUP2"
+        group: "GROUP2",
       },
       relations: ["salaryProfiles"],
     });
@@ -2062,7 +2108,7 @@ export class ReportController extends Controller {
     const salaryProfileSpecial = await this.salaryProfileRepository.find({
       relations: ["salaryOrg"],
       where: {
-        salaryOrgId: In([salaryOrgGroup1?.id, salaryOrgGroup2?.id,]),
+        salaryOrgId: In([salaryOrgGroup1?.id, salaryOrgGroup2?.id]),
         amountSpecial: MoreThan(1),
       },
       select: [
@@ -2081,7 +2127,7 @@ export class ReportController extends Controller {
       ],
       order: {
         salaryOrg: {
-          group: "ASC"
+          group: "ASC",
         },
         posMasterNo: "ASC",
       },
@@ -2090,10 +2136,10 @@ export class ReportController extends Controller {
     const salaryProfileNoAmount = await this.salaryProfileRepository.find({
       relations: ["salaryOrg"],
       where: {
-        salaryOrgId: In([salaryOrgGroup1?.id, salaryOrgGroup2?.id,]),
+        salaryOrgId: In([salaryOrgGroup1?.id, salaryOrgGroup2?.id]),
         // amountUse: IsNull() || 0,
         // positionSalaryAmount: IsNull() || 0,
-        type: "NONE"
+        type: "NONE",
       },
       select: [
         "id",
@@ -2110,7 +2156,7 @@ export class ReportController extends Controller {
       ],
       order: {
         salaryOrg: {
-          group: "ASC"
+          group: "ASC",
         },
         posMasterNo: "ASC",
       },
@@ -2122,8 +2168,9 @@ export class ReportController extends Controller {
       position: item.position,
       posType: item.posType,
       posLevel: item.posLevel,
-      posMasterNo: 
-        Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
+      posMasterNo:
+        Extension.ToThaiNumber(item.orgShortName) +
+        Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
       amount:
         item.amount == undefined || item.amount == null
           ? "๐"
@@ -2141,8 +2188,9 @@ export class ReportController extends Controller {
       position: item.position,
       posType: item.posType,
       posLevel: item.posLevel,
-      posMasterNo: 
-        Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
+      posMasterNo:
+        Extension.ToThaiNumber(item.orgShortName) +
+        Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
       amount:
         item.amount == undefined || item.amount == null
           ? "๐"
@@ -2281,9 +2329,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -2362,9 +2413,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel:  profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         score: null,
         reason: null,
@@ -2443,9 +2497,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -2521,9 +2578,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -2606,9 +2666,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -2684,9 +2747,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -2820,7 +2886,8 @@ export class ReportController extends Controller {
         fullName: fullName,
         position: profile.position,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "๐",
         type1:
           _salaryProfileEmpAPR.length > 0
@@ -3029,7 +3096,8 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -3101,9 +3169,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -3182,9 +3253,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
         reason: null, // หมายเหตุ
@@ -3256,9 +3330,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -3337,9 +3414,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
           : null,
@@ -3420,9 +3500,12 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
+        posLevel: profile.posLevel
+          ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+          : null,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null, // หมายเหตุ
       };
@@ -3494,7 +3577,8 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -3566,7 +3650,8 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -3863,7 +3948,8 @@ export class ReportController extends Controller {
         fullName: fullName,
         position: profile.position,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         yearOld2:
           octPreviousYear2 == null
@@ -4090,7 +4176,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         //เมษา ปีก่อนหน้า
         typeOld2:
@@ -4248,7 +4335,8 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -4328,7 +4416,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
           : null,
@@ -4416,7 +4505,8 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -4495,7 +4585,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
         score: null,
@@ -4569,7 +4660,8 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -4688,7 +4780,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         typeOld2:
           octPreviousYear2 && octPreviousYearProfile2.length > 0
@@ -4842,7 +4935,8 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -5036,7 +5130,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -5124,7 +5219,8 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -5203,7 +5299,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -5313,7 +5410,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -5401,7 +5499,8 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@@ -5487,7 +5586,8 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
           : null,
@@ -5577,7 +5677,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -5683,7 +5784,8 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         reason: null,
       };
@@ -5901,7 +6003,8 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
+          Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
         amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index c08c963..3adbb36 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -2118,6 +2118,7 @@ export class SalaryPeriodController extends Controller {
               salaryProfileNew.isNext = salaryOld == null ? false : salaryOld.isNext;
               salaryProfileNew.isSpecial = salaryOld == null ? false : salaryOld.isSpecial;
               salaryProfileNew.isReserve = salaryOld == null ? false : salaryOld.isReserve;
+              salaryProfileNew.isRetired = salaryOld == null ? false : salaryOld.isRetired;
             }
             await this.salaryProfileRepository.save(salaryProfileNew);
           }
@@ -2163,6 +2164,7 @@ export class SalaryPeriodController extends Controller {
               salaryProfileNew.isNext = salaryOld == null ? false : salaryOld.isNext;
               salaryProfileNew.isSpecial = salaryOld == null ? false : salaryOld.isSpecial;
               salaryProfileNew.isReserve = salaryOld == null ? false : salaryOld.isReserve;
+              salaryProfileNew.isRetired = salaryOld == null ? false : salaryOld.isRetired;
             }
             await this.salaryProfileEmployeeRepository.save(salaryProfileNew);
           }
@@ -2606,8 +2608,9 @@ export class SalaryPeriodController extends Controller {
               salaryProfileNew.positionSalaryAmount =
                 salaryOld == null ? 0 : salaryOld.positionSalaryAmount;
               salaryProfileNew.isNext = salaryOld == null ? false : salaryOld.isNext;
-              salaryProfileNew.type = salaryOld == null ? false : salaryOld.isSpecial;
+              salaryProfileNew.isSpecial = salaryOld == null ? false : salaryOld.isSpecial;
               salaryProfileNew.isReserve = salaryOld == null ? false : salaryOld.isReserve;
+              salaryProfileNew.isRetired = salaryOld == null ? false : salaryOld.isRetired;
             }
             await this.salaryProfileRepository.save(salaryProfileNew);
           }
@@ -2651,8 +2654,9 @@ export class SalaryPeriodController extends Controller {
               salaryProfileNew.positionSalaryAmount =
                 salaryOld == null ? 0 : salaryOld.positionSalaryAmount;
               salaryProfileNew.isNext = salaryOld == null ? false : salaryOld.isNext;
-              salaryProfileNew.type = salaryOld == null ? false : salaryOld.isSpecial;
+              salaryProfileNew.isSpecial = salaryOld == null ? false : salaryOld.isSpecial;
               salaryProfileNew.isReserve = salaryOld == null ? false : salaryOld.isReserve;
+              salaryProfileNew.isRetired = salaryOld == null ? false : salaryOld.isRetired;
             }
             await this.salaryProfileEmployeeRepository.save(salaryProfileNew);
           }
diff --git a/src/interfaces/extension.ts b/src/interfaces/extension.ts
index 1355587..48975b6 100644
--- a/src/interfaces/extension.ts
+++ b/src/interfaces/extension.ts
@@ -30,6 +30,37 @@ class Extension {
     }
   }
 
+  public static ToThaiShortMonth(value: number) {
+    switch (value) {
+      case 1:
+        return "ม.ค.";
+      case 2:
+        return "ก.พ.";
+      case 3:
+        return "มี.ค.";
+      case 4:
+        return "เม.ย.";
+      case 5:
+        return "พ.ค.";
+      case 6:
+        return "มิ.ย.";
+      case 7:
+        return "ก.ค.";
+      case 8:
+        return "ส.ค.";
+      case 9:
+        return "ก.ย.";
+      case 10:
+        return "ต.ค.";
+      case 11:
+        return "พ.ย.";
+      case 12:
+        return "ธ.ค.";
+      default:
+        return "";
+    }
+  }
+
   public static ToThaiYear(value: number) {
     if (value < 2400) return value + 543;
     else return value;
@@ -67,6 +98,18 @@ class Extension {
     );
   }
 
+  public static ToThaiShortDate(value: Date) {
+    let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
+    return (
+      "วันที่ " + 
+      value.getDate() +
+      " " +
+      Extension.ToThaiShortMonth(value.getMonth() + 1) +
+      " " +
+      yy.toString().slice(-2)
+    );
+  }
+
   public static sumObjectValues(array: any, propertyName: any) {
     let sum = 0;
     for (let i = 0; i < array.length; i++) {