From 1c3ce46bcb843d19a77b6b1612d09769ff0c3d45 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Mon, 12 Jan 2026 13:41:23 +0700 Subject: [PATCH] update LeaveController to determine status based on leave request and range #2187 --- BMA.EHR.Leave/Controllers/LeaveController.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index 9b1773ee..7dafb605 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -2437,7 +2437,23 @@ namespace BMA.EHR.Leave.Service.Controllers { if (time < endTime) { - status = "ABSENT"; + + //string checkOutStatus = "NORMAL"; + var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, time.Date); + if (leaveReq != null) + { + var leaveRange = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper(); + if (leaveRange == "AFTERNOON" || leaveRange == "ALL") + status = "NORMAL"; + else + { + status = "ABSENT"; + } + } + else + { + status = "ABSENT"; + } } else {