diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
index a5fdc491..7ac83031 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
@@ -346,16 +346,34 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
             else
             {
-                ret = new CheckInResultDto
+                if (data.CheckOut != null)
                 {
-                    StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning,
-                    EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning,
-                    StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon,
-                    EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon,
-                    Description = duty == null ? "-" : duty.Description,
-                    CheckInTime = data.CheckIn,
-                    CheckInId = data.CheckOut == null ? data.Id : null,
-                };
+                    ret = new CheckInResultDto
+                    {
+                        StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning,
+                        EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning,
+                        StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon,
+                        EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon,
+                        Description = duty == null ? "-" : duty.Description,
+                        CheckInTime = null,
+                        CheckInId = null,
+                    };
+                }
+                else
+                {
+                    ret = new CheckInResultDto
+                    {
+                        StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning,
+                        EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning,
+                        StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon,
+                        EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon,
+                        Description = duty == null ? "-" : duty.Description,
+                        CheckInTime = data.CheckIn,
+                        CheckInId = data.Id,
+                    };
+                }
+
+
             }
 
             return Success(ret);