diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
index 4d7a5c58..63383450 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
@@ -75,7 +75,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, string? status = "WAITTING")
+        public async Task<ActionResult<ResponseObject>> GetListByAdmin(string type, string? status = "")
         {
             string role = "";
             if (type.Trim().ToUpper() == "OFFICER")
@@ -173,8 +173,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                 p.child4DnaOldId,
                             })
                             .ToListAsync();
-            //if (status != null && status.Trim().ToUpper() != "WAITTING")
-            if (status != null)
+
+            if (!string.IsNullOrEmpty(status))
                 retirementOuts = retirementOuts.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
 
             if (role == "OWNER")