From 2146e0e0ca24742e2c1508ac104aab1f77c2050f Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Thu, 21 May 2026 15:49:51 +0700
Subject: [PATCH] fix issue #2515

---
 .../Controllers/LeaveReportController.cs      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 09542e34..ec31f89a 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -1675,18 +1675,22 @@ namespace BMA.EHR.Leave.Service.Controllers
                             agencyCount = agencyCount,
                             coupleCount = coupleCount,
                             therapyCount = therapyCount,
+                            
+                            // ระบบนับจำนวนครั้ง วันลาพักผ่อนด้วย ซึ่งตามระเบียบไม่ให้นับจำนวนครั้งวันลาพักผ่อนครับ จำนวนครั้งนับเฉพาะ ป่วย กับ กิจ
+                            leaveTotal = sickCount +                                       
+                                         personalCount
 
-                            leaveTotal = sickCount +
-                                         maternityCount +
-                                         wifeCount +
-                                         personalCount +
-                                         restCount +
-                                         ordainCount +
-                                         absentCount +
-                                         studyCount +
-                                         agencyCount +
-                                         coupleCount +
-                                         therapyCount
+                            // leaveTotal = sickCount +
+                            //              maternityCount +
+                            //              wifeCount +
+                            //              personalCount +
+                            //              restCount +
+                            //              ordainCount +
+                            //              absentCount +
+                            //              studyCount +
+                            //              agencyCount +
+                            //              coupleCount +
+                            //              therapyCount
                         };