From 9b0f1f0b3e4956326d8c1030bcfe1a0b9a119359 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 21 Feb 2025 12:39:01 +0700 Subject: [PATCH] fix #1188 --- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 4 ++++ BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index f7f322f3..8cdbd0c2 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1224,6 +1224,10 @@ namespace BMA.EHR.Leave.Service.Controllers LeaveNumber = rawData.LeaveNumber, LeaveDetail = rawData.LeaveDetail, LeaveDocument = new(), + + + LeaveLast = rawData.LeaveLast, + //LeaveDocument = rawData.LeaveDocument == null ? null : await _minIOService.ImagesPath(rawData.LeaveDocument.Id), LeaveDraftDocument = rawData.LeaveDraftDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDraftDocument.Id), diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs index 5dd222cb..b97474a2 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs @@ -107,13 +107,13 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest public string? CoupleDayCountryHistory { get; set; } - public string? CoupleDayTotalHistory { get; set; } + public string? CoupleDayTotalHistory { get; set; } - public DateTime? CoupleDayStartDateHistory { get; set; } + public DateTime? CoupleDayStartDateHistory { get; set; } public DateTime? CoupleDayEndDateHistory { get; set; } - public string? CoupleDaySumTotalHistory { get; set; } + public string? CoupleDaySumTotalHistory { get; set; } public string? Dear { get; set; } = string.Empty; @@ -124,5 +124,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest public string? PositionLevelName { get; set; } = string.Empty; public string? OrganizationName { get; set; } = string.Empty; + + public DateTime? LeaveLast { get; set; } } }