diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index c45cbbd4..d4b60e3f 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -1186,6 +1186,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             var checkout_base = DateTime.Parse($"{DateTime.Now.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
 
 
+            // var test = await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year);
+            // return Success(test);
+
             var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year))
                             .Select(d => new CheckInHistoryDto
                             {
@@ -2491,8 +2494,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
 
 
-                resultCheckInDateAndTime = DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckInTime}");
-                resultCheckOutDateAndTime = DateTime.Parse($"{resultCheckOutDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckOutTime}");
+                resultCheckInDateAndTime = resultCheckInDate is null ? null : DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckInTime}");
+                resultCheckOutDateAndTime = resultCheckOutDate is null ? null : DateTime.Parse($"{resultCheckOutDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckOutTime}");
 
 
                 // create result object to return
@@ -2515,8 +2518,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     "LATE" :
                                     "NORMAL",
 
-                    CheckOutStatus = resultCheckInDate == null ? null :
-                                     resultCheckOutDate == null ? null :
+                    CheckOutStatus = resultCheckInDateAndTime == null ? null :
+                                     resultCheckOutDateAndTime == null ? null :
                                      DateTime.Parse(resultCheckOutDateAndTime.Value.ToString("yyyy-MM-dd HH:mm")) <
                                      DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
                                      "ABSENT" :