From 1a0e712a1c6681dfc227d5fa892bc5067618e3f4 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 3 Feb 2026 21:03:40 +0700 Subject: [PATCH] Update leave limit logic and add GovAge property to user leave profile DTO --- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 7 ++++++- .../DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 61ac7c4f..a961bfa2 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -900,7 +900,11 @@ namespace BMA.EHR.Leave.Service.Controllers if (govAge < 180) leaveLimit = 0; else - leaveLimit = leaveData == null ? 0 : leaveData.LeaveDays; + { + leaveLimit = leaveData == null ? + govAge < 180 ? 0 : 10 + : leaveData.LeaveDays; + } } else leaveLimit = leaveType.Limit; @@ -955,6 +959,7 @@ namespace BMA.EHR.Leave.Service.Controllers CurrentDistrict = profile.CurrentDistrict ?? "", CurrentProvince = profile.CurrentProvince ?? "", CurrentZipCode = profile.CurrentZipCode ?? "", + GovAge = govAge }; return Success(result); diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs index 6ddc93cb..e64b5ac3 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs @@ -51,5 +51,7 @@ public string? CurrentProvince { get; set; } public string? CurrentZipCode { get; set; } + + public int GovAge { get; set; } = 0; } }