diff --git a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
index ff714ccd..3771aa93 100644
--- a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
@@ -108,10 +108,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 if (req.Type != Guid.Empty)
                     resData = resData.Where(x => x.LeaveTypeId == req.Type).ToList();
 
-                if (req.Keyword != "")
-                    resData = resData.Where(x => x.FirstName!.Contains(req.Keyword) || x.LastName!.Contains(req.Keyword)).ToList();
-
-                var result = new List<object>();
+                var result = new List<dynamic>();
 
                 foreach (var item in resData)
                 {
@@ -119,6 +116,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     {
                         item.Id,
                         item.ProfileId,
+                        FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
                         item.Prefix,
                         item.FirstName,
                         item.LastName,
@@ -135,6 +133,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                     });
                 }
 
+                if (req.Keyword != "")
+                    result = result.Where(x => x.FullName!.Contains(req.Keyword)).ToList();
+
                 var pageResult = result.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
 
                 return Success(new { data = pageResult, total = result.Count });
diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index f04e4fa8..c607be5f 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -1312,6 +1312,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     LeaveStartDate = item.LeaveStartDate,
                     LeaveEndDate = item.LeaveEndDate,
                     HajjDayStatus = item.HajjDayStatus,
+                    LeaveRange = item.LeaveRange,
+                    LeaveRangeEnd = item.LeaveRangeEnd,
                 };
                 result.Add(res);
             }
diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
index aad7661c..56eb8300 100644
--- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
@@ -22,5 +22,9 @@
         public DateTime LeaveStartDate { get; set; } = DateTime.Now;
 
         public DateTime LeaveEndDate { get; set; } = DateTime.Now;
+
+        public string? LeaveRange { get; set; } = "ALL";
+
+        public string? LeaveRangeEnd { get; set; } = "ALL";
     }
 }