diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 8faf42c2..7f90fbe1 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -1015,13 +1015,18 @@ namespace BMA.EHR.Leave.Service.Controllers
                 };
 
                 var startTime = "";
+                var endTime = "";
                 if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
                 {
                     //startTime = "09:30";
                     startTime = "10:30";
+                    endTime = "12:00";
                 }
                 else
+                {
                     startTime = duty.StartTimeMorning;
+                    endTime = duty.EndTimeMorning;
+                }
 
                 string checkInStatus = "NORMAL";
                 var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date);
@@ -1126,15 +1131,22 @@ namespace BMA.EHR.Leave.Service.Controllers
                 }
 
                 var endTime = "";
+                var startTime = "";
+                var endTimeMorning = "";
                 if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
                 {
-                    //startTime = "09:30";
+                    startTime = "13:00";
                     endTime = "14:30";
+                    endTimeMorning = "12:00";
                 }
                 else
+                {
                     endTime = duty.EndTimeAfternoon;
+                    startTime = duty.StartTimeAfternoon;
+                    endTimeMorning = duty.EndTimeMorning;
+                }
 
-                var endTimeMorning = duty.EndTimeMorning;
+                
 
                 string checkOutStatus = "NORMAL";
                 var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date);
@@ -1161,7 +1173,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                             "NORMAL" :
                                             "ABSENT" :
                                             DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
-                                            DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
+                                            DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTimeMorning}") ?
                                             "ABSENT" :
                                             "NORMAL";
                     }    
@@ -1178,7 +1190,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         "NORMAL" :
                                         "ABSENT" :
                                         DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
-                                        DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
+                                        DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTimeMorning}") ?
                                         "ABSENT" :
                                         "NORMAL";
                 }