diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index d13db46b..a551fe30 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -119,7 +119,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
                             .Include(x => x.Type)
                             .Where(x => x.LeaveStartDate.Year == year)
-                            .Where(x => x.LeaveStatus != "REJECT" || x.LeaveStatus != "DELETE")
+                            .Where(x => x.LeaveStatus != "REJECT" && x.LeaveStatus != "DELETE")
                             .ToListAsync();
 
             return data;
diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
index 669b27a2..79b0cf49 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
@@ -756,6 +756,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     "LATE" :
                                     "NORMAL",
                     CheckInDescription = d.CheckInRemark ?? "",
+                    IsLocationCheckIn = d.IsLocationCheckIn,
+                    CheckInLocationName = d.CheckInLocationName ?? "",
 
                     CheckOutDate = d.CheckOut == null ? null : d.CheckOut.Value.Date,
                     CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm"),
@@ -773,6 +775,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     "ABSENT" :
                                     "NORMAL",
                     CheckOutDescription = d.CheckOutRemark ?? "",
+
+                    IsLocationCheckOut = d.IsLocationCheckOut,
+                    CheckOutLocationName = d.CheckOutLocationName ?? ""
                 };
 
                 return Success(result);
diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
index ba9874f1..e99e5717 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
@@ -469,7 +469,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                     FullName = $"{profile.Prefix.Name}{profile.FirstName} {profile.LastName}",
                     DateSendLeave = item.CreatedAt.Date,
                     IsDelete = item.LeaveStatus == "DELETE",
-                    Status = item.LeaveStatus
+                    Status = item.LeaveStatus,
+                    LeaveStartDate = item.LeaveStartDate,
+                    LeaveEndDate = item.LeaveEndDate
                 };
                 result.Add(res);
             }
diff --git a/BMA.EHR.Leave.Service/DTOs/CheckIn/CheckInDetailForAdminDto.cs b/BMA.EHR.Leave.Service/DTOs/CheckIn/CheckInDetailForAdminDto.cs
index 31f74427..a31d6f1c 100644
--- a/BMA.EHR.Leave.Service/DTOs/CheckIn/CheckInDetailForAdminDto.cs
+++ b/BMA.EHR.Leave.Service/DTOs/CheckIn/CheckInDetailForAdminDto.cs
@@ -22,6 +22,10 @@
 
         public string CheckInDescription { get; set; } = string.Empty;
 
+        public bool IsLocationCheckIn { get; set; } = true;
+
+        public string? CheckInLocationName { get; set; } = string.Empty;
+
         public DateTime? CheckOutDate { get; set; } = DateTime.MinValue;
 
         public string? CheckOutStatus { get; set; } = string.Empty;
@@ -37,5 +41,9 @@
         public string? CheckOutImg { get; set; } = string.Empty;
 
         public string? CheckOutDescription { get; set; } = string.Empty;
+
+        public bool IsLocationCheckOut { get; set; } = true;
+
+        public string? CheckOutLocationName { get; set; } = string.Empty;
     }
 }
diff --git a/BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs b/BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
index 0857e364..3c6ed905 100644
--- a/BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
+++ b/BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
@@ -15,5 +15,9 @@
         public string Status { get; set; }
 
         public bool IsDelete { get; set; }
+
+        public DateTime LeaveStartDate { get; set; } = DateTime.Now;
+
+        public DateTime LeaveEndDate { get; set; } = DateTime.Now;
     }
 }