diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
index 3804c18f..85f1d1e5 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
@@ -720,7 +720,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs b/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
index be6ba483..6c64eb87 100644
--- a/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
+++ b/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
@@ -605,7 +605,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
             }
 
 
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -881,7 +881,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
             if (insigniaType == null)
                 return Error(GlobalMessages.InsigniaTypeNotFound);
 
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 431e00b7..8c2e8412 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -956,7 +956,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 }
                 var profile = new List<GetProfileByKeycloakIdRootDto>();
-                string role = jsonData["result"]["privilege"]?.ToString();
+                string role = jsonData["result"]?.ToString();
                 var nodeId = string.Empty;
                 var profileAdmin = new GetUserOCAllDto();
                 profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -1363,7 +1363,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 }
                 var profile = new List<GetProfileByKeycloakIdRootDto>();
-                string role = jsonData["result"]["privilege"]?.ToString();
+                string role = jsonData["result"]?.ToString();
                 var nodeId = string.Empty;
                 var profileAdmin = new GetUserOCAllDto();
                 profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -1679,7 +1679,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
                 var employees = new List<dynamic>();
                 var count = 1;
-                string role = jsonData["result"]["privilege"]?.ToString();
+                string role = jsonData["result"]?.ToString();
                 var nodeId = string.Empty;
                 var profileAdmin = new GetUserOCAllDto();
                 profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -1785,7 +1785,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 }
 
-                string role = jsonData["result"]["privilege"]?.ToString();
+                string role = jsonData["result"]?.ToString();
                 var nodeId = string.Empty;
                 var profileAdmin = new GetUserOCAllDto();
                 profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 310cc84f..134c081f 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -1594,7 +1594,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             //var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminWithAuthAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, keycloakList);
             //var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate);
 
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -1780,7 +1780,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
 
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
index 448cc9b8..f043b65e 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
@@ -75,13 +75,13 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet()]
         public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
-            var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_PROMOTION_OFFICER", UserId);
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_PROMOTION_OFFICER");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
index 04a03e57..cd8845b8 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
@@ -74,13 +74,13 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet()]
         public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
-            var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_PROMOTION_EMP", UserId);
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_PROMOTION_EMP");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
index f96e0f9c..cc868b2b 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
@@ -75,13 +75,13 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet()]
         public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
-            var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TEMPDUTY", UserId);
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_TEMPDUTY");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
index e9f531f5..67eeff36 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@@ -76,13 +76,13 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet()]
         public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
-            var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TRANSFER_RECEIVE", UserId);
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_TRANSFER_RECEIVE");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
index 9a16af88..6935a57d 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
@@ -76,13 +76,13 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet()]
         public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
-            var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TEMPDUTY2", UserId);
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_TEMPDUTY2");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
index 14def837..b7cee90d 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
@@ -168,13 +168,13 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet()]
         public async Task<ActionResult<ResponseObject>> GetListByAdmin(string? status = "ALL")
         {
-            var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TRANSFER_REQ", UserId);
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_TRANSFER_REQ");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
index 844fec5e..8b3571f4 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
@@ -80,13 +80,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
         [HttpGet()]
         public async Task<ActionResult<ResponseObject>> GetList()
         {
-            var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_PASSAWAY", UserId);
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_PASSAWAY");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index 2afa095d..5a3d4413 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -82,7 +82,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
index f823c8ba..a696b6a5 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
@@ -83,7 +83,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 54b47dda..d2b36c51 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -239,7 +239,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -343,7 +343,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -2109,7 +2109,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index 02499eca..85988965 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -178,7 +178,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -282,7 +282,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -2037,7 +2037,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]["privilege"]?.ToString();
+            string role = jsonData["result"]?.ToString();
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);