From 5007b6f10df92451617e62de3e2fa2beed183ec9 Mon Sep 17 00:00:00 2001 From: Adisak Date: Tue, 28 Oct 2025 09:25:48 +0700 Subject: [PATCH] =?UTF-8?q?update=20=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98?= =?UTF-8?q?=E0=B8=B4=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementAppointmentController.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index d0cc4f7a..fa496969 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -230,12 +230,14 @@ namespace BMA.EHR.Placement.Service.Controllers else if (role == "NORMAL") { placementAppointments = placementAppointments - .Where( - x => node == 0 ? x.child1DnaId == null - : (node == 1 ? x.child1DnaId != null && x.child2DnaId == null - : (node == 2 ? x.child2DnaId != null && x.child3DnaId == null - : (node == 3 ? x.child3DnaId != null && x.child4DnaId == null : true))) - ).ToList(); + .Where(x => + (node == 0 && x.child1DnaId == null && x.rootDnaId == nodeId) || + (node == 1 && x.child1DnaId != null && x.child2DnaId == null && x.child1DnaId == nodeId) || + (node == 2 && x.child2DnaId != null && x.child3DnaId == null && x.child2DnaId == nodeId) || + (node == 3 && x.child3DnaId != null && x.child4DnaId == null && x.child3DnaId == nodeId) || + (node == 4 && x.child4DnaId == nodeId) + ) + .ToList(); } return Success(placementAppointments); }