From c6fee999ebca48535a41274ae32792bd2460ed4b Mon Sep 17 00:00:00 2001 From: kittapath <> Date: Mon, 23 Jun 2025 18:43:09 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementReceiveController.cs | 7 +++--- .../Controllers/RetirementOutController.cs | 24 +++++++++++++++---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 67eeff36..30a74581 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -188,6 +188,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.posLevelOldId, p.posLevelNameOld, p.CreatedAt, + p.CreatedUserId, p.profileId, p.rootDnaId, p.child1DnaId, @@ -206,17 +207,17 @@ namespace BMA.EHR.Placement.Service.Controllers if (role == "OWNER" || role == "CHILD") { placementReceives = placementReceives - .Where(x => node == 4 ? x.child4DnaId == nodeId : (node == 3 ? x.child3DnaId == nodeId : (node == 2 ? x.child2DnaId == nodeId : (node == 1 ? x.child1DnaId == nodeId : (node == 0 ? x.rootDnaId == nodeId : (node == null ? true : true)))))).ToList(); + .Where(x => (node == 4 ? x.child4DnaId == nodeId : (node == 3 ? x.child3DnaId == nodeId : (node == 2 ? x.child2DnaId == nodeId : (node == 1 ? x.child1DnaId == nodeId : (node == 0 ? x.rootDnaId == nodeId : (node == null ? true : true)))))) || (x.CreatedUserId == UserId)).ToList(); } else if (role == "ROOT") { placementReceives = placementReceives - .Where(x => x.rootDnaId == nodeId).ToList(); + .Where(x => (x.rootDnaId == nodeId) || (x.CreatedUserId == UserId)).ToList(); } else if (role == "NORMAL") { placementReceives = placementReceives - .Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList(); + .Where(x => (node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))) || (x.CreatedUserId == UserId)).ToList(); } return Success(placementReceives); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index 9e4609e2..be2799c1 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -77,13 +77,27 @@ namespace BMA.EHR.Retirement.Service.Controllers [HttpGet("{type}")] public async Task> GetListByAdmin(string type, string? status = "WAITTING") { - var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISMISS"); - var jsonData = JsonConvert.DeserializeObject(getPermission); - if (jsonData["status"]?.ToString() != "200") + string role = ""; + if (type.Trim().ToUpper() == "OFFICER") { - return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); + var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISMISS"); + var jsonData = JsonConvert.DeserializeObject(getPermission); + if (jsonData["status"]?.ToString() != "200") + { + return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); + } + role = jsonData["result"]?.ToString(); + } + else + { + var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISMISS_EMP"); + var jsonData = JsonConvert.DeserializeObject(getPermission); + if (jsonData["status"]?.ToString() != "200") + { + return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); + } + role = jsonData["result"]?.ToString(); } - string role = jsonData["result"]?.ToString(); var nodeId = string.Empty; var profileAdmin = new GetUserOCAllDto(); profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken); From 1887c62e18d295d6dbe9d3513f3bffdc4f829295 Mon Sep 17 00:00:00 2001 From: kittapath <> Date: Mon, 23 Jun 2025 19:53:40 +0700 Subject: [PATCH 2/2] add save dna root emp retire out --- .../Controllers/RetirementOutController.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index be2799c1..4d7a5c58 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -380,18 +380,23 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementOut.citizenId = org.result.citizenId; retirementOut.rootOld = org.result.root; retirementOut.rootOldId = org.result.rootId; + retirementOut.rootDnaOldId = org.result.rootDnaId; retirementOut.rootShortNameOld = org.result.rootShortName; retirementOut.child1Old = org.result.child1; retirementOut.child1OldId = org.result.child1Id; + retirementOut.child1DnaOldId = org.result.child1DnaId; retirementOut.child1ShortNameOld = org.result.child1ShortName; retirementOut.child2Old = org.result.child2; retirementOut.child2OldId = org.result.child2Id; + retirementOut.child2DnaOldId = org.result.child2DnaId; retirementOut.child2ShortNameOld = org.result.child2ShortName; retirementOut.child3Old = org.result.child3; retirementOut.child3OldId = org.result.child3Id; + retirementOut.child3DnaOldId = org.result.child3DnaId; retirementOut.child3ShortNameOld = org.result.child3ShortName; retirementOut.child4Old = org.result.child4; retirementOut.child4OldId = org.result.child4Id; + retirementOut.child4DnaOldId = org.result.child4DnaId; retirementOut.child4ShortNameOld = org.result.child4ShortName; retirementOut.posMasterNoOld = org.result.posMasterNo; retirementOut.posTypeOldId = org.result.posTypeId;