diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
index 4803d54c..cdfe9b16 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@@ -65,7 +65,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(int page = 1, int pageSize = 10, string keyword = "")
         {
             // var rootId = "";
             // var child1Id = "";
@@ -170,7 +170,22 @@ namespace BMA.EHR.Placement.Service.Controllers
                         .ToListAsync();
             // if (PlacementAdmin == true)
             //     placementReceives.Where(x => x.Status.Trim().ToUpper().Contains("PENDING"));
+            if (keyword != "")
+            {
+                var data = placementReceives.Where(x => x.prefix.Contains(keyword) ||
+                                    x.firstName.Contains(keyword) ||
+                                    x.lastName.Contains(keyword) ||
+                                    x.citizenId.Contains(keyword) ||
+                                    x.root.Contains(keyword) ||
+                                    x.nodeName.Contains(keyword) ||
+                                    x.nodeShortName.Contains(keyword))
+                    .OrderByDescending(x => x.CreatedAt)
+                    .Skip((page - 1) * pageSize)
+                    .Take(pageSize)
+                    .ToList();
 
+                placementReceives = data;
+            }
             return Success(placementReceives);
             // }
         }