From 2730ac9174e73e5413969874edf2142a89a70212 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 22 Apr 2025 13:16:37 +0700 Subject: [PATCH] fix #1134 --- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 665b7cab..7c765654 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -2051,8 +2051,12 @@ namespace BMA.EHR.Leave.Service.Controllers WifeDayName = rawData.WifeDayName, WifeDayDateBorn = rawData.WifeDayDateBorn, - RestDayOldTotal = rawData.RestDayOldTotal, - RestDayCurrentTotal = rawData.RestDayCurrentTotal, + RestDayOldTotal = extendLeave, + RestDayCurrentTotal = rawData.Type.Limit, + // #1134 + //RestDayOldTotal = rawData.RestDayOldTotal, + //RestDayCurrentTotal = rawData.RestDayCurrentTotal, + OrdainDayStatus = rawData.OrdainDayStatus, OrdainDayLocationName = rawData.OrdainDayLocationName, OrdainDayLocationAddress = rawData.OrdainDayLocationAddress,