BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs

@@ -1877,7 +1877,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
-                            .Where(x => ((x.DateSendLeave ?? x.CreatedAt).Date >= startDate && (x.DateSendLeave ??x.CreatedAt).Date < endDate))
+                            .Where(x => (x.DateSendLeave ?? x.CreatedAt).Date >= startDate && (x.DateSendLeave ??x.CreatedAt).Date < endDate)
                             //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
                             .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
                             .ToListAsync();

BMA.EHR.Leave/Controllers/LeaveReportController.cs

@@ -156,8 +156,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                 await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync2(data.KeycloakUserId,
                     data.Type.Id, data.CreatedAt);
 
-            var startFiscalYear = (new DateTime(data.LeaveStartDate.Year - 1, 10, 1)).Date;
-            var endFiscalYear = (data.DateSendLeave ?? data.CreatedAt).Date; 
+            var startFiscalYear = new DateTime(data.LeaveStartDate.Year - 1, 10, 1);
+            var endFiscalYear = data.CreatedAt; 
 
             var thisYear = data.LeaveStartDate.Year;
             var toDay = data.LeaveStartDate.Date;
@@ -1533,21 +1533,17 @@ namespace BMA.EHR.Leave.Service.Controllers
                             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
                         };