From aa31ac0f0616798bd54c16fb0624c0d9b39c1cae Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Wed, 19 Feb 2025 14:35:59 +0700 Subject: [PATCH] fix retirement --- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 4ede5c50..16e0c2e8 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -884,6 +884,7 @@ namespace BMA.EHR.Leave.Service.Controllers therapyDayCount }; + employees.Add(emp); count++; } @@ -1011,7 +1012,7 @@ namespace BMA.EHR.Leave.Service.Controllers var duty = userRound ?? defaultRound; - var processTimeStamps = timeStamps + /* var processTimeStamps = timeStamps .Select(d => new { d.Id, @@ -1030,7 +1031,12 @@ namespace BMA.EHR.Leave.Service.Controllers }); var absentCount = processTimeStamps.Count(x => x.CheckOutStatus == "ABSENT"); - var lateCount = processTimeStamps.Count(x => x.CheckInStatus == "LATE"); + var lateCount = processTimeStamps.Count(x => x.CheckInStatus == "LATE");*/ + + var absentCount = timeStamps.Count(d => + d.CheckOutStatus == "ABSENT"); // นับจำนวนที่มี CheckOutStatus == "ABSENT" + var lateCount = timeStamps.Count(d => + d.CheckInStatus == "LATE"); // นับจำนวนที่มี CheckInStatus == "LATE" var emp = new {