From a8d01c42d82c11681bab543c16fbadd116f05b41 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 14 Aug 2025 15:36:16 +0700
Subject: [PATCH] #1718

---
 src/controllers/ReportController.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index c05ac1c..2e53835 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -4102,8 +4102,10 @@ export class ReportController extends Controller {
               " " +
               Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
             : "-",
-        amount: profile.positionSalaryAmount
-          ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
+        amount: profile.positionSalaryAmount && profile.positionSalaryAmount != 0
+          ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString()) 
+          : profile.amount && profile.amount != 0
+          ? Extension.ToThaiNumber(profile.amount.toLocaleString())
           : "-",
         precentTwo:
           profile.positionSalaryAmountPer == 0.02
@@ -5611,7 +5613,9 @@ export class ReportController extends Controller {
         fullName: fullName,
         affiliation: affiliation,
         position: profile.position,
-        posLevel: profile.posLevel ? Extension.ToThaiNumber(profile.posLevel.toString()) : null,
+        posLevel: profile.posLevel
+        ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+        : null,
         posNumber:
           Extension.ToThaiNumber(profile.orgShortName) +
           " " +
@@ -6531,8 +6535,8 @@ export class ReportController extends Controller {
         affiliation: affiliation,
         position: position,
         posLevel: profile.posLevel
-          ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
-          : "-",
+        ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
+        : "-",
         posNumber:
           Extension.ToThaiNumber(profile.orgShortName) +
           " " +