From 2a6bef472b40b32d64e38da4909f2eecf0e95c25 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 12 Mar 2025 10:26:47 +0700
Subject: [PATCH] fix issue #1234

---
 BMA.EHR.Leave/Controllers/LeaveReportController.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 21f92c57..fdbfd6bf 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -1362,7 +1362,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     dateTimeStamp = $"ณ วัน{req.StartDate.Date.GetThaiDayOfWeek()} ที่ {req.StartDate.Date.ToThaiShortDate()}{enddate}",
                     organizationName = profile?.FirstOrDefault()?.Oc ?? "",
-                    officerTotal = profile.Count,
+                    officerTotal = profile?.Count,
                     workTotal = workTotal,
                     restTotal = restTotal,
                     sickTotal = sickTotal,
@@ -1370,6 +1370,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     wfhTotal = wfhTotal,
                     seminarTotal = seminarTotal,
                     studyTotal = studyTotal,
+                    type = type.Trim().ToUpper() == "OFFICER" ? "ข้าราชการทั้งหมด" : "ลูกจ้างประจำทั้งหมด",
                     employees = employees
                 };
                 //วันที่ออก