diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
index 8511c34b..342254c9 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
@@ -68,7 +68,7 @@ namespace BMA.EHR.Placement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet()]
-        public async Task<ActionResult<ResponseObject>> GetListByAdmin()
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
             var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_PROMOTION_OFFICER", UserId);
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -169,6 +169,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.typeCommand,
                         })
                         .ToListAsync();
+            if (status != null && status.Trim().ToUpper() != "ALL")
+                placementAppointments = placementAppointments.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
             return Success(placementAppointments);
         }
 
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
index 11aaef01..ae52a64a 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
@@ -67,7 +67,7 @@ namespace BMA.EHR.Placement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet()]
-        public async Task<ActionResult<ResponseObject>> GetListByAdmin()
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
             var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_PROMOTION_EMP", UserId);
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -191,7 +191,8 @@ namespace BMA.EHR.Placement.Service.Controllers
 
             //     placementAppointments = data;
             // }
-
+            if (status != null && status.Trim().ToUpper() != "ALL")
+                placementAppointments = placementAppointments.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
             return Success(placementAppointments);
         }
 
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
index bfb7ec9b..7f589e2b 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
@@ -68,7 +68,7 @@ namespace BMA.EHR.Placement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet()]
-        public async Task<ActionResult<ResponseObject>> GetListByAdmin()
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
             var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TEMPDUTY", UserId);
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -127,7 +127,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.IsActive,
                         })
                         .ToListAsync();
-
+            if (status != null && status.Trim().ToUpper() != "ALL")
+                placementOfficers = placementOfficers.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
             return Success(placementOfficers);
         }
 
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
index 102c5dcc..55a8c66f 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@@ -69,7 +69,7 @@ namespace BMA.EHR.Placement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet()]
-        public async Task<ActionResult<ResponseObject>> GetListByAdmin()
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
             var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TRANSFER_RECEIVE", UserId);
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -164,6 +164,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                 p.profileId,
                             })
                         .ToListAsync();
+            if (status != null && status.Trim().ToUpper() != "ALL")
+                placementReceives = placementReceives.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
             return Success(placementReceives);
         }
 
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
index 0dfd8e8c..6c65ce03 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
@@ -69,7 +69,7 @@ namespace BMA.EHR.Placement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet()]
-        public async Task<ActionResult<ResponseObject>> GetListByAdmin()
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
             var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TEMPDUTY2", UserId);
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -132,6 +132,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.DateRepatriation,
                         })
                         .ToListAsync();
+            if (status != null && status.Trim().ToUpper() != "ALL")
+                placementRepatriations = placementRepatriations.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
             return Success(placementRepatriations);
         }
 
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
index 9eb2f0fc..f545dce7 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
@@ -161,7 +161,7 @@ namespace BMA.EHR.Placement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet()]
-        public async Task<ActionResult<ResponseObject>> GetListByAdmin()
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
             var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TRANSFER_REQ", UserId);
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -224,6 +224,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.IsActive,
                         })
                         .ToListAsync();
+            if (status != null && status.Trim().ToUpper() != "ALL")
+                placementTransfers = placementTransfers.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
             return Success(placementTransfers);
         }
 
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index 78b362e9..893ba38d 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -68,7 +68,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet()]
-        public async Task<ActionResult<ResponseObject>> GetListByAdmin()
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         // public async Task<ActionResult<ResponseObject>> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "")
         {
             var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_PLACEMENT_OTHER");
@@ -166,7 +166,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
 
                 //     retirementOthers = data;
                 // }
-
+                if (status != null && status.Trim().ToUpper() != "ALL")
+                    retirementOthers = retirementOthers.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
                 return Success(retirementOthers);
             }
         }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
index b77658b0..c84639f8 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
@@ -69,7 +69,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet("{type}")]
-        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string type)
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string type, string? status = "WAITTING")
         {
             var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISMISS");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -148,7 +148,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     p.IsActive,
                                 })
                                 .ToListAsync();
-
+                if (status != null && status.Trim().ToUpper() != "WAITTING")
+                    retirementOuts = retirementOuts.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
                 return Success(retirementOuts);
             }
         }