From 795502a93cd30174b23759476bb2835b2f8e8ee4 Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Mon, 15 Dec 2025 16:46:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=E0=B8=AA=E0=B8=B2=E0=B8=A3=E0=B8=A3=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=20#2109?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/LeaveReportController.cs      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index ea798ed9..00684dc1 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -181,6 +181,21 @@ namespace BMA.EHR.Leave.Service.Controllers
                     LeaveRemain = (data.Type.Limit - sumLeave).ToString().ToThaiNumber(),
                     LeaveAll = (data.LeaveTotal + sumLeave).ToString().ToThaiNumber(),
 
+                    Type1 = data.Type.Name == "ลาป่วย" ? "🗹" : "☐",
+                    Type2 = data.Type.Name == "ลากิจส่วนตัว" ? "🗹" : "☐",
+                    Type3 = data.Type.Name == "ลาคลอดบุตร" ? "🗹" : "☐",
+
+                    leaveS1 = data.Type.Name == "ลาป่วย" ? sumLeave.ToString().ToThaiNumber() : "",
+                    leaveS2 = data.Type.Name == "ลากิจส่วนตัว" ? sumLeave.ToString().ToThaiNumber() : "",
+                    leaveS3 = data.Type.Name == "ลาคลอดบุตร" ? sumLeave.ToString().ToThaiNumber() : "",
+
+                    leaveT1 = data.Type.Name == "ลาป่วย" ? data.LeaveTotal.ToString().ToThaiNumber() : "",
+                    leaveT2 = data.Type.Name == "ลากิจส่วนตัว" ? data.LeaveTotal.ToString().ToThaiNumber() : "",
+                    leaveT3 = data.Type.Name == "ลาคลอดบุตร" ? data.LeaveTotal.ToString().ToThaiNumber() : "",
+
+                    leaveA1 = data.Type.Name == "ลาป่วย" ? (data.LeaveTotal + sumLeave).ToString().ToThaiNumber() : "",
+                    leaveA2 = data.Type.Name == "ลากิจส่วนตัว" ? (data.LeaveTotal + sumLeave).ToString().ToThaiNumber() : "",
+                    leaveA3 = data.Type.Name == "ลาคลอดบุตร" ? (data.LeaveTotal + sumLeave).ToString().ToThaiNumber() : "",
                     approve = approveResult,
                     leaveStatus = data.LeaveStatus != null && data.LeaveStatus!.ToUpper() == "APPROVE"
                                     ? "🗹 อนุญาต  ☐ ไม่อนุญาต"
@@ -354,6 +369,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                         leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
                         LeaveTotal = data.LeaveTotal.ToString().ToThaiNumber(),//data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
 
+                        hajjStatus = data.HajjDayStatus == true ? "☐ ยังไม่เคย 🗹 เคย" : "🗹 ยังไม่เคย ☐ เคย",
                         approve = approveResult,
                         leaveStatus = data.LeaveStatus != null && data.LeaveStatus!.ToUpper() == "APPROVE"
                             ? "🗹 อนุญาต  ☐ ไม่อนุญาต"
@@ -395,6 +411,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                         leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
                         LeaveTotal = data.LeaveTotal.ToString().ToThaiNumber(),//data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
 
+                        ordainStatus = data.OrdainDayStatus == true ? "☐ ยังไม่เคย 🗹 เคย" : "🗹 ยังไม่เคย ☐ เคย",
                         approve = approveResult,
                         leaveStatus = data.LeaveStatus != null && data.LeaveStatus!.ToUpper() == "APPROVE"
                             ? "🗹 อนุญาต  ☐ ไม่อนุญาต"
@@ -514,6 +531,14 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveAddress = data.LeaveAddress.ToThaiNumber(),
                     leaveNumber = data.LeaveNumber.ToThaiNumber(),
 
+                    Type1 = data.LeaveSubTypeName == "ศึกษาต่อ" ? "🗹" : "☐",
+                    Type2 = data.LeaveSubTypeName == "ฝึกอบรม" ? "🗹" : "☐",
+                    Type3 = data.LeaveSubTypeName == "ปฎิบัติการวิจัย" ? "🗹" : "☐",
+                    Type4 = data.LeaveSubTypeName == "ดูงาน" ? "🗹" : "☐",
+                    country1 = data.LeaveSubTypeName == "ศึกษาต่อ" ? data.StudyDayCountry.ToThaiNumber() ?? "" : "",
+                    country2 = data.LeaveSubTypeName != "ศึกษาต่อ" ? data.StudyDayCountry.ToThaiNumber() ?? "" : "",
+                    scholarship1 = data.LeaveSubTypeName == "ศึกษาต่อ" ? data.StudyDayScholarship.ToThaiNumber() ?? "" : "☐",
+                    scholarship2 = data.LeaveSubTypeName != "ศึกษาต่อ" ? data.StudyDayScholarship.ToThaiNumber() ?? "" : "☐",
                     approve = approveResult,
                     leaveStatus = data.LeaveStatus != null && data.LeaveStatus!.ToUpper() == "APPROVE"
                         ? "🗹 อนุญาต  ☐ ไม่อนุญาต"
@@ -764,6 +789,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                         orgChild3 = x.OrgChild3 == null ? "" : x.OrgChild3.ToThaiNumber(),
                         orgChild4 = x.OrgChild4 == null ? "" : x.OrgChild4.ToThaiNumber(),
                     }).ToList(),
+
                     educations = profileLeave.Educations.Select(x => new
                     {
                         educationLevel = x.EducationLevel == null ? "" : x.EducationLevel.ToThaiNumber(),
@@ -772,6 +798,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                         finishDate = x.FinishDate == null ? "-" : x.FinishDate.Value.ToThaiShortDate().ToThaiNumber()
                     }).ToList(),
 
+                    Type1 = profile.ProfileType == "OFFICER" ? "🗹" : "☐",
+                    Type2 = profile.ProfileType != "OFFICER" ? "🗹" : "☐",
                     approve = approveResult,
                     leaveStatus = data.LeaveStatus != null && data.LeaveStatus!.ToUpper() == "APPROVE"
                          ? "🗹 อนุญาต  ☐ ไม่อนุญาต"