diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index ffc4ae0a..6478b9fb 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1764,6 +1764,11 @@ namespace BMA.EHR.Leave.Service.Controllers : await _minIOService.ImagesPath(rawData.LeaveCancelDocument.Id), LeaveReasonDelete = rawData.LeaveCancelComment ?? "", LeaveTotal = rawData.LeaveTotal, + + + LeaveDirectorComment = rawData.LeaveDirectorComment, + LeaveRange = rawData.LeaveRange, + LeaveRangeEnd = rawData.LeaveRangeEnd, }; return Success(result); diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetCancelLeaveRequestByIdDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetCancelLeaveRequestByIdDto.cs index c44d35b6..a9aec603 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetCancelLeaveRequestByIdDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetCancelLeaveRequestByIdDto.cs @@ -29,5 +29,11 @@ public DateTime LeaveStartDate { get; set; } = DateTime.MinValue; public DateTime LeaveEndDate { get; set;} = DateTime.MinValue; + + public string? LeaveRange { get;set; } = string.Empty; + + public string? LeaveRangeEnd { get; set; } = string.Empty; + + public string? LeaveDirectorComment { get; set; } = string.Empty; } }