From 68ac1392c93fc95ee6430f523ad7cd4739571587 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Fri, 5 Apr 2024 17:19:07 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20orgShort?=
 =?UTF-8?q?Name=20=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A1=E0=B8=B5=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=A7=E0=B9=80=E0=B8=A5=E0=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ReportController.ts | 93 +++++++++++++++--------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 134d14a..b903fe4 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -276,7 +276,7 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          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,
       };
@@ -1126,7 +1126,7 @@ export class ReportController extends Controller {
               " " +
               item.lastName, // สังกัด/ชื่อ-นามสกุล
             posLevel: item.posLevel,
-            posMasterNo: item.orgShortName + Extension.ToThaiNumber(String(item.posMasterNo)),
+            posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
             amount:
               item.amount == undefined || item.amount == null
                 ? "๐"
@@ -1172,7 +1172,7 @@ export class ReportController extends Controller {
               " " +
               item.lastName, // สังกัด/ชื่อ-นามสกุล
             posLevel: item.posLevel,
-            posMasterNo: item.orgShortName + Extension.ToThaiNumber(String(item.posMasterNo)),
+            posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
             amount:
               item.amount == undefined || item.amount == null
                 ? "๐"
@@ -1426,7 +1426,7 @@ export class ReportController extends Controller {
               " " +
               item.lastName, // สังกัด/ชื่อ-นามสกุล
             posLevel: item.posLevel,
-            posMasterNo: item.orgShortName + Extension.ToThaiNumber(String(item.posMasterNo)),
+            posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
             amount:
               item.amount == undefined || item.amount == null
                 ? "๐"
@@ -1485,7 +1485,7 @@ export class ReportController extends Controller {
               " " +
               item.lastName, // สังกัด/ชื่อ-นามสกุล
             posLevel: item.posLevel,
-            posMasterNo: item.orgShortName + Extension.ToThaiNumber(String(item.posMasterNo)),
+            posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
             amount:
               item.amount == undefined || item.amount == null
                 ? "๐"
@@ -1600,7 +1600,7 @@ 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: profile.orgShortName + Extension.ToThaiNumber(String(profile.posMasterNo)),
+        orgShortName: Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString())),
         amount:
           profile.amount == undefined || profile.amount == null || profile.amount == 0
             ? ""
@@ -1702,7 +1702,7 @@ 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: profile.orgShortName + Extension.ToThaiNumber(String(profile.posMasterNo)),
+        orgShortName: Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString())),
         amount:
           profile.amount == undefined || profile.amount == null || profile.amount == 0
             ? ""
@@ -1807,7 +1807,7 @@ export class ReportController extends Controller {
         position: position,
         posLevel: profile.posLevel,
         posNumber:
-          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, //สรุปผลการประเมินฯ ระดับและคะแนน
@@ -1894,10 +1894,11 @@ export class ReportController extends Controller {
         position: position,
         posLevel: profile.posLevel,
         posNumber:
-          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, //สรุปผลการประเมินฯ ระดับและคะแนน
-        reason: null,
+        remark: null, //หมายเหตุ
       };
     });
 
@@ -1983,7 +1984,7 @@ export class ReportController extends Controller {
         (item.root == undefined && item.root == null ? "" : item.root),
       posType: item.posType,
       posLevel: item.posLevel,
-      posMasterNo: item.orgShortName + Extension.ToThaiNumber(String(item.posMasterNo)),
+      posMasterNo: Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
       amount:
         item.amount == undefined || item.amount == null
           ? "๐"
@@ -2122,7 +2123,7 @@ export class ReportController extends Controller {
       posType: item.posType,
       posLevel: item.posLevel,
       posMasterNo: 
-        item.orgShortName + Extension.ToThaiNumber(String(item.posMasterNo)),
+        Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
       amount:
         item.amount == undefined || item.amount == null
           ? "๐"
@@ -2141,7 +2142,7 @@ export class ReportController extends Controller {
       posType: item.posType,
       posLevel: item.posLevel,
       posMasterNo: 
-        item.orgShortName + Extension.ToThaiNumber(String(item.posMasterNo)),
+        Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
       amount:
         item.amount == undefined || item.amount == null
           ? "๐"
@@ -2282,7 +2283,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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,
       };
@@ -2363,7 +2364,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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,
@@ -2445,7 +2446,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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())
@@ -2523,7 +2524,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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())
@@ -2604,7 +2605,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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())
@@ -2682,7 +2683,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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())
@@ -2816,7 +2817,7 @@ export class ReportController extends Controller {
         fullName: fullName,
         position: profile.position,
         posNumber:
-          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
@@ -3025,7 +3026,7 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          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,
       };
@@ -3099,7 +3100,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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())
@@ -3180,7 +3181,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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, // หมายเหตุ
@@ -3254,7 +3255,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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())
@@ -3335,7 +3336,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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,
@@ -3418,7 +3419,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: `${profile.posTypeShort} ${profile.posLevel}`,
         posNumber:
-          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, // หมายเหตุ
       };
@@ -3490,7 +3491,7 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          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,
       };
@@ -3562,7 +3563,7 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          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,
       };
@@ -3859,7 +3860,7 @@ export class ReportController extends Controller {
         fullName: fullName,
         position: profile.position,
         posNumber:
-          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
@@ -4086,7 +4087,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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:
@@ -4244,7 +4245,7 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          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())
@@ -4324,7 +4325,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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,
@@ -4412,7 +4413,7 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          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())
@@ -4491,7 +4492,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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,
@@ -4565,7 +4566,7 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          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,
       };
@@ -4684,7 +4685,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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
@@ -4838,7 +4839,7 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          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())
@@ -5032,7 +5033,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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())
@@ -5120,7 +5121,7 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          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())
@@ -5199,7 +5200,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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,
       };
@@ -5309,7 +5310,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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())
@@ -5397,7 +5398,7 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          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())
@@ -5483,7 +5484,7 @@ export class ReportController extends Controller {
           (profile.root == undefined && profile.root == null ? "" : profile.root),
         posLevel: profile.posLevel,
         posNumber:
-          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,
@@ -5573,7 +5574,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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,
       };
@@ -5679,7 +5680,7 @@ export class ReportController extends Controller {
         fullName: fullName,
         posLevel: profile.posLevel,
         posNumber:
-          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,
       };
@@ -5897,7 +5898,7 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel,
         posNumber:
-          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())