From 3cc2db0d1deba5c567f43c22f61021c7be73a62e Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Tue, 17 Oct 2023 10:22:46 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=20=E0=B8=81=E0=B8=811?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controllers/ProfileReportController.cs |  12 +++++++-----
 Report/Profile/rptKK1_Page2.trdp       | Bin 2343 -> 2348 bytes
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs
index 78156eb..da2760e 100644
--- a/Controllers/ProfileReportController.cs
+++ b/Controllers/ProfileReportController.cs
@@ -519,8 +519,10 @@ namespace BMA.EHR.Report.Service.Controllers
                                     OcFullPath = _profileService.GetOrganizationNameFullPath(p.OcId.Value, false, false),
                                 }).FirstOrDefault();
 
-                var salary = (from s in _context.ProfileSalaries.Include(x => x.PositionLevel)
-                              join pos in _context.PositionPaths on s.PositionId equals pos.Id
+                var salary = (from s in _context.ProfileSalaries
+                                        .Include(x => x.PositionLevel)
+                              join pos in _context.PositionPaths.AsQueryable()
+                                        on s.PositionId equals pos.Id
                               join pos_no in _context.PositionNumbers on s.PosNoId equals pos_no.Id
                               //   join pos_lv in _context.PositionLevels on s.PositionLevelId equals pos_lv.Id
                               join pos_type in _context.PositionTypes on s.PositionTypeId equals pos_type.Id
@@ -529,14 +531,14 @@ namespace BMA.EHR.Report.Service.Controllers
                               select new
                               {
                                   SalaryDate = s.Date == null ? "" : s.Date == new DateTime(1, 1, 1) ? "" : s.Date.Value.ToThaiShortDate(),
-                                  Position = s.SalaryClass,
+                                  Position = $"{pos.Name} ประเภท{pos_type.Name} ระดับ{s.PositionLevel.Name}",
                                   PosNo = pos_no.Name,
                                   Rank = s.PositionLevel == null ? null : s.PositionLevel.Name,
-                                  Salary = s.Amount == null ? "" : s.Amount.ToString().ToInteger().ToNumericText(),
+                                  Salary = s.Amount == null ? "" : s.Amount == 0 ? "-" : s.Amount.ToString().ToInteger().ToNumericText(),
                                   RefAll = s.SalaryRef,
                                   PositionType = pos_type.Name,
                                   PositionLevel = s.PositionLevel == null ? null : s.PositionLevel.Name,
-                                  PositionAmount = s.PositionSalaryAmount == null ? "" : s.PositionSalaryAmount.Value.ToString().ToInteger().ToNumericText(),
+                                  PositionAmount = s.PositionSalaryAmount == null ? "" : s.PositionSalaryAmount.Value == 0 ? "-" : s.PositionSalaryAmount.Value.ToString().ToInteger().ToNumericText(),
                                   FullName = profile2.FullName,
                                   OcFullPath = profile2.OcFullPath
                               }).ToList();
diff --git a/Report/Profile/rptKK1_Page2.trdp b/Report/Profile/rptKK1_Page2.trdp
index f082e7ac0d0961b3fb51c77cd6bf5a9c7a0b51ff..fb0495e7d2be35451e3f79c34583fed32cd52429 100644
GIT binary patch
delta 2006
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

delta 2021
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
DM+?Js