diff --git a/BMA.EHR.Application/Repositories/UserProfileRepository.cs b/BMA.EHR.Application/Repositories/UserProfileRepository.cs
index 8bd12d91..30e4a792 100644
--- a/BMA.EHR.Application/Repositories/UserProfileRepository.cs
+++ b/BMA.EHR.Application/Repositories/UserProfileRepository.cs
@@ -304,6 +304,37 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithNoneValidateKeycloakAllOfficer(string? accessToken, int? node, string? nodeId, bool isAll)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/none-validate-keycloak-all-officer";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    isAll = isAll,
+                };
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllOfficerRetireFilter(string? accessToken, int? node, string? nodeId, bool isAll, bool? isRetirement)
         {
             try
@@ -367,6 +398,37 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithNoneValidateKeycloakAllEmployee(string? accessToken, int? node, string? nodeId, bool isAll)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/none-validate-keycloak-all-employee";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    isAll = isAll,
+                };
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllOfficerAndRevision(string? accessToken, int? node, string? nodeId, bool isAll, string? revisionId)
         {
             try
@@ -399,6 +461,38 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithNoneValidateKeycloakAllOfficerAndRevision(string? accessToken, int? node, string? nodeId, bool isAll, string? revisionId)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/none-validate-keycloak-all-officer";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    isAll = isAll,
+                    revisionId = revisionId,
+                };
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllOfficerRetireFilterAndRevision(string? accessToken, int? node, string? nodeId, bool isAll, bool? isRetirement, string? revisionId)
         {
             try
@@ -464,6 +558,37 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithNoneValidateKeycloakAllEmployeeAndRevision(string? accessToken, int? node, string? nodeId, bool isAll, string? revisionId)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/none-validate-keycloak-all-employee";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    isAll = isAll,
+                    revisionId = revisionId,
+                };
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
         public async Task<List<SearchProfileDto>> SearchProfile(string? citizenId, string? firstName, string? lastName, string accessToken)
         {
             try
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index fdbfd6bf..834a83ef 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -780,11 +780,13 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var profile = new List<GetProfileByKeycloakIdRootDto>();
                 if (type.Trim().ToUpper() == "OFFICER")
                 {
-                    profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficerAndRevision(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.revisionId);
+                    //profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficerAndRevision(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.revisionId);
+                    profile = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllOfficerAndRevision(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.revisionId);
                 }
                 else
                 {
-                    profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployeeAndRevision(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.revisionId);
+                    //profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployeeAndRevision(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.revisionId);
+                    profile = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllEmployeeAndRevision(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.revisionId);
                 }
                 // get leave day
                 var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByTypeAndRange(req.StartDate, req.EndDate);
@@ -1160,11 +1162,13 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var profile = new List<GetProfileByKeycloakIdRootDto>();
                 if (type.Trim().ToUpper() == "OFFICER")
                 {
-                    profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
+                    //profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
+                    profile = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
                 }
                 else
                 {
-                    profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
+                    //profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
+                    profile = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
                 }
                 var date = req.StartDate.Date;