From 5a248f212dc1c1a638e5264bc7eef5ca10f4ab35 Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Mon, 16 Dec 2024 10:33:52 +0700
Subject: [PATCH] report leave

---
 .../Controllers/LeaveReportController.cs          | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index e968ed66..7dd783ea 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -1189,23 +1189,20 @@ namespace BMA.EHR.Leave.Service.Controllers
                             return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
                         }
                     }
-
+                    DateTime? checkIn = p.CheckIn ?? null;
+                    DateTime? checkOut = p.CheckOut ?? null;
                     var emp = new
                     {
                         no = count,
                         fullName = fullName,
                         dutyTimeName = $"{duty.StartTimeMorning} - {duty.EndTimeAfternoon} น.",
                         checkInLocation = p.CheckInPOI,
-                        checkInTime = $"{p.CheckIn.ToString("HH:mm")} น.",
+                        checkInTime = $"{checkIn?.ToString("HH:mm") ?? ""} น.",
                         checkOutLocation = p.CheckOutPOI ?? "",
-                        checkOutTime = p.CheckOut != null ?
-                                        $"{p.CheckOut.Value.ToString("HH:mm")} น." :
-                                        "",
+                        checkOutTime = $"{checkOut?.ToString("HH:mm") ?? ""} น.",
                         remark = "",
-                        checkInDate = p.CheckIn.Date.ToThaiFullDate2().ToThaiNumber(),
-                        checkedOutDate = p.CheckOut != null ?
-                                            p.CheckOut.Value.ToThaiFullDate2().ToThaiNumber() :
-                                            "",
+                        checkInDate = checkIn?.ToThaiFullDate2()?.ToThaiNumber() ?? "",
+                        checkedOutDate = checkOut?.ToThaiFullDate2()?.ToThaiNumber() ?? "",
                     };
                     employees.Add(emp);
                     count++;