diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 4787de39..809a28e3 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -3637,8 +3637,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             
              //if (data.CheckInStatus == "NORMAL" || data.CheckOutStatus == "NORMAL")
             
-            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(userId, AccessToken);
+            //var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+            // แก้เป็นมาใช้งาน KeycloakUserId แทน
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(data.KeycloakUserId, AccessToken);
             var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
             if (defaultRound == null)
             {