diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 28c11dc3..6e104be7 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -553,13 +553,13 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
         }
 
-        [HttpGet("check-status/{id:guid}")]
+        [HttpGet("check-status")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        [AllowAnonymous]
-        public async Task<ActionResult<ResponseObject>> CheckInCheckStatus(Guid id)
+        public async Task<ActionResult<ResponseObject>> CheckInCheckStatus()
         {
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
             var currentDate = DateTime.Now;
             var channel = _objectPool.Get();
             try
@@ -612,9 +612,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 }
 
                 // Step 3: ค้นหา taskIds ที่อยู่ใน messages ทั้งหมด
-                var foundTasks = allMessages.FirstOrDefault(x => x.Contains(id.ToString("D")));
+                var foundTasks = allMessages.FirstOrDefault(x => x.Contains(userId.ToString("D")));
 
-                return Success(new { taskId = id, InQueue = foundTasks != null });
+                return Success(new { keycloakId = userId, InQueue = foundTasks != null });
 
             }
             catch (Exception ex)