diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 8eeccf9f..8af7c35c 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -334,21 +334,6 @@ namespace BMA.EHR.Leave.Service.Controllers
             // save to database
             await _leaveRequestRepository.AddAsync(leaveRequest);
 
-            var baseAPIOrg = _configuration["API"];
-            var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
-            using (var client = new HttpClient())
-            {
-                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-                var _res = await client.PostAsJsonAsync(apiUrlOrg, new
-                {
-                    refId = leaveRequest.Id,
-                    sysName = "LEAVE_LIST",
-                    posLevelName = profile.PosLevel,
-                    posTypeName = profile.PosType,
-                });
-            }
-
             return Success(new { id = leaveRequest.Id });
         }
 
@@ -1462,6 +1447,28 @@ namespace BMA.EHR.Leave.Service.Controllers
         {
             await _leaveRequestRepository.SendToOfficerAsync(id);
 
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            if (profile == null)
+            {
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            }
+            var baseAPIOrg = _configuration["API"];
+            var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
+            using (var client = new HttpClient())
+            {
+                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
+                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                var _res = await client.PostAsJsonAsync(apiUrlOrg, new
+                {
+                    refId = id,
+                    sysName = "LEAVE_LIST",
+                    posLevelName = profile.PosLevel?.PosLevelName ?? "",
+                    posTypeName = profile.PosType?.PosTypeName ?? "",
+                });
+                Console.WriteLine(_res);
+            }
+
             return Success();
         }
 
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index a5f7f0c3..15dc99a3 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -508,7 +508,19 @@ namespace BMA.EHR.Retirement.Service.Controllers
                         true
                 );
             await _context.SaveChangesAsync();
-
+            using (var client = new HttpClient())
+            {
+                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                var _res = await client.PostAsJsonAsync($"{_configuration["API"]}/org/workflow/add-workflow", new
+                {
+                    refId = retirementResign.Id,
+                    sysName = "RETIREMENT_RESIFNATION",
+                    posLevelName = retirementResign.PositionLevelOld,
+                    posTypeName = retirementResign.PositionTypeOld,
+                });
+                Console.WriteLine(_res);
+            }
             return Success(retirementResign);
         }