diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index f3ae545..b3fa5e6 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -1057,15 +1057,23 @@ export class ReportController extends Controller {
                 : Extension.ToThaiNumber(String(item.amount.toLocaleString())),
             salaryIncrease1:
               salaryProfile1.length > 0
-                ? salaryProfile1
-                    .filter((profile) => profile.citizenId === item.citizenId)
-                    .map((profile) => profile.amount)
+                ? (() => {
+                    const filteredAmount = salaryProfile1
+                      .filter((profile) => profile.citizenId === item.citizenId)
+                      .map((profile) => profile.amount);
+                    const Amount = filteredAmount[0];
+                    return Amount === undefined || Amount === null ? "๐" : Extension.ToThaiNumber(Amount?.toLocaleString());
+                  })()
                 : "๐", //การเลื่อนเงินเดือนปีก่อนๆหน้า
             salaryIncrease2:
               salaryProfile2.length > 0
-                ? salaryProfile2
-                    .filter((profile) => profile.citizenId === item.citizenId)
-                    .map((profile) => profile.amount)
+                ? (() => {
+                    const filteredAmount = salaryProfile2
+                      .filter((profile) => profile.citizenId === item.citizenId)
+                      .map((profile) => profile.amount);
+                    const Amount = filteredAmount[0];
+                    return Amount === undefined || Amount === null ? "๐" : Extension.ToThaiNumber(Amount?.toLocaleString());
+                  })()
                 : "๐", //การเลื่อนเงินเดือนปีก่อนหน้า
             score: null, //ผลการประเมินฯ
             remark: null, //หมายเหตุ
@@ -1221,21 +1229,33 @@ export class ReportController extends Controller {
                 : Extension.ToThaiNumber(String(item.amount.toLocaleString())),
             salaryIncrease1:
               salaryProfile1.length > 0
-                ? salaryProfile1
-                    .filter((profile) => profile.citizenId === item.citizenId)
-                    .map((profile) => profile.amount)
+                ? (() => {
+                    const filteredAmount = salaryProfile1
+                      .filter((profile) => profile.citizenId === item.citizenId)
+                      .map((profile) => profile.amount);
+                    const Amount = filteredAmount[0];
+                    return Amount === undefined || Amount === null ? "๐" : Extension.ToThaiNumber(Amount?.toLocaleString());
+                  })()
                 : "๐", //การเลื่อนเงินเดือนปีก่อนๆหน้า
             salaryIncrease2:
               salaryProfile2.length > 0
-                ? salaryProfile2
+                ? (() => {
+                  const filteredAmount = salaryProfile2
                     .filter((profile) => profile.citizenId === item.citizenId)
-                    .map((profile) => profile.amount)
+                    .map((profile) => profile.amount);
+                  const Amount = filteredAmount[0];
+                  return Amount === undefined || Amount === null ? "๐" : Extension.ToThaiNumber(Amount?.toLocaleString());
+                })()
                 : "๐", //การเลื่อนเงินเดือนปีก่อนหน้า
             salaryIncreaseAPR:
               salaryProfile_APR.length > 0
-                ? salaryProfile_APR
+                ? (() => {
+                  const filteredAmount = salaryProfile_APR
                     .filter((profile) => profile.citizenId === item.citizenId)
-                    .map((profile) => profile.amount)
+                    .map((profile) => profile.amount);
+                  const Amount = filteredAmount[0];
+                  return Amount === undefined || Amount === null ? "๐" : Extension.ToThaiNumber(Amount?.toLocaleString());
+                })()
                 : "๐", //การเลื่อนเงินเดือนรอบเมษา
             Type: item.type === "FULL" ? "หนึ่งขั้น" : "หนึ่งขั้นครึ่ง",
             score1: null, //ผลการประเมินฯ ครั้งที่ 1