diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index de03013f..bac4d14c 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -1649,9 +1649,9 @@ namespace BMA.EHR.Leave.Service.Controllers fullName = fullName, dutyTimeName = $"{duty.StartTimeMorning} - {duty.EndTimeAfternoon} น.", checkInLocation = p.CheckInPOI, - checkInTime = $"{checkIn?.ToString("HH:mm") ?? ""} น.", + checkInTime = checkIn?.ToString("HH:mm") is string timeIn ? $"{timeIn} น." : "", checkOutLocation = p.CheckOutPOI ?? "", - checkOutTime = $"{checkOut?.ToString("HH:mm") ?? ""} น.", + checkOutTime = checkOut?.ToString("HH:mm") is string timeOut ? $"{timeOut} น." : "", remark = "", checkInDate = checkIn?.ToThaiFullDate2()?.ToThaiNumber() ?? "", checkedOutDate = checkOut?.ToThaiFullDate2()?.ToThaiNumber() ?? "",