From 05689b5338b8fe0a47c659f5494005e3b2c7d6f0 Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Mon, 5 Jan 2026 13:20:00 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20query=20?=
 =?UTF-8?q?=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B9=83=E0=B8=9A=E0=B8=82=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5=E0=B8=B4=E0=B8=81=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/LeaveReportController.cs       | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index b5f620c0..9f88401b 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -935,7 +935,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 //    if (list.Count > 0)
                 //        approver = list.First().Name;
                 //}
-
+                var approveResult = await GetApproverData(data.Approvers);
                 var result = new
                 {
                     template = "แบบใบขอยกเลิกวันลา",
@@ -956,6 +956,22 @@ namespace BMA.EHR.Leave.Service.Controllers
                         profileType = data.ProfileType,
                         leaveReasonDelete = data.LeaveCancelComment == null ? "" : data.LeaveCancelComment!.ToThaiNumber(),
                         leaveDetail = data.LeaveDetail.ToThaiNumber(),
+
+                        Type1 = profile.ProfileType == "OFFICER" ? "🗹" : "☐",
+                        Type2 = profile.ProfileType != "OFFICER" ? "🗹" : "☐",
+                        Type3 = "☐",
+                        approve = approveResult,
+                        approverComment = !string.IsNullOrEmpty(data.LeaveDirectorComment)
+                                        ? data.LeaveDirectorComment.Replace("\r", "").Replace("\n", "").Trim() 
+                                        : "......................",
+                        approverUpdatedAt = data.LastUpdatedAt.HasValue 
+                                        ? data.LastUpdatedAt.Value.ToThaiShortDate().ToThaiNumber() 
+                                        : "...... /...... /......",
+                        leaveStatus = data.LeaveCancelStatus != null && data.LeaveCancelStatus!.ToUpper() == "APPROVE"
+                                        ? "🗹 อนุญาต  ☐ ไม่อนุญาต"
+                                        : data.LeaveCancelStatus != null && data.LeaveCancelStatus!.ToUpper() == "REJECT"
+                                            ? "☐ อนุญาต  🗹 ไม่อนุญาต"
+                                            : "☐ อนุญาต  ☐ ไม่อนุญาต"
                     }
                 };