From 7630cb4277ffe17fe92d083b500746105d5440f3 Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 24 Dec 2024 13:34:54 +0700 Subject: [PATCH] no message --- .../Controllers/PlacementController.cs | 16 ++++++++-------- .../Controllers/RetirementOtherController.cs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 6dfb31a4..cebc8517 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -161,10 +161,10 @@ namespace BMA.EHR.Placement.Service.Controllers if (org.result.isOfficer == false) { rootId = org.result.rootId == null ? "" : org.result.rootId; - child1Id = org.result.child1Id == null ? "" : org.result.child1Id; - child2Id = org.result.child2Id == null ? "" : org.result.child2Id; - child3Id = org.result.child3Id == null ? "" : org.result.child3Id; - child4Id = org.result.child4Id == null ? "" : org.result.child4Id; + // child1Id = org.result.child1Id == null ? "" : org.result.child1Id; + // child2Id = org.result.child2Id == null ? "" : org.result.child2Id; + // child3Id = org.result.child3Id == null ? "" : org.result.child3Id; + // child4Id = org.result.child4Id == null ? "" : org.result.child4Id; var data1 = await _context.PlacementProfiles .Where(x => x.Placement.Id == examId) .Where(x => x.Draft == true) @@ -633,10 +633,10 @@ namespace BMA.EHR.Placement.Service.Controllers if (org.result.isOfficer == false) { rootId = org.result.rootId == null ? "" : org.result.rootId; - child1Id = org.result.child1Id == null ? "" : org.result.child1Id; - child2Id = org.result.child2Id == null ? "" : org.result.child2Id; - child3Id = org.result.child3Id == null ? "" : org.result.child3Id; - child4Id = org.result.child4Id == null ? "" : org.result.child4Id; + // child1Id = org.result.child1Id == null ? "" : org.result.child1Id; + // child2Id = org.result.child2Id == null ? "" : org.result.child2Id; + // child3Id = org.result.child3Id == null ? "" : org.result.child3Id; + // child4Id = org.result.child4Id == null ? "" : org.result.child4Id; var placement = await _context.Placements .Where(x => x.Id == examId) .Select(x => new diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 2f5d1bed..3ee9b641 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 var child2Id = ""; var child3Id = ""; var child4Id = ""; - var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position"; + var apiUrl = $"{_configuration["API"]}/org/permission/checkOrg/{UserId}"; using (var client = new HttpClient()) { client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));