diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index f6c10944..a1dca0fc 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -230,7 +230,12 @@ namespace BMA.EHR.Placement.Service.Controllers else if (role == "NORMAL") { placementAppointments = placementAppointments - .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.child1DnaId != null && x.child2DnaId == null + : (node == 2 ? x.child2DnaId != null && x.child3DnaId == null + : (node == 3 ? x.child3DnaId != null && x.child4DnaId == null : true))) + ).ToList(); } return Success(placementAppointments); }