From 07e81361889457f7fb4fc2aec4b598bf6cac2b62 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 3 Apr 2025 16:39:46 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=A5=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5=E0=B9=83=E0=B8=99=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=AA=E0=B8=B7=E0=B8=AD=E0=B8=A5=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Repositories/Reports/RetireReportRepository.cs       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
index 12379e65..48abbadd 100644
--- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
@@ -482,6 +482,8 @@ namespace BMA.EHR.Application.Repositories.Reports
                             p.SendDate,
                             p.ActiveDate,
                             p.Reason,
+                            p.ReasonResign,
+                            p.Remark,
                             p.Status,
                             salary = p.AmountOld,
                             p.ApproveReason,
@@ -517,6 +519,8 @@ namespace BMA.EHR.Application.Repositories.Reports
                             p.SendDate,
                             p.ActiveDate,
                             p.Reason,
+                            p.ReasonResign,
+                            p.Remark,
                             p.Status,
                             salary = p.AmountOld,
                             p.ApproveReason,
@@ -547,11 +551,14 @@ namespace BMA.EHR.Application.Repositories.Reports
                 data.prefix,
                 data.firstName,
                 data.lastName,
-                data.Location,
+                Location = string.IsNullOrEmpty(data.Location) ? string.Empty : data.Location.ToThaiNumber(),
                 FullName = $"{data.prefix}{data.firstName} {data.lastName}",
                 SendDate = string.IsNullOrEmpty(data.SendDate.ToString()) ? string.Empty : DateTime.Parse(data.SendDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
                 ActiveDate = string.IsNullOrEmpty(data.ActiveDate.ToString()) ? string.Empty : DateTime.Parse(data.ActiveDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
                 data.Reason,
+                data.ReasonResign,
+                data.Remark,
+                ReasonRemark = data.Reason == "OTHER" ? string.IsNullOrEmpty(data.Remark) ? data.ReasonResign : $"{data.ReasonResign}({data.Remark})" : data.ReasonResign,
                 data.Status,
                 data.salary,
                 data.PositionTypeOld,