From a8dc4b82db1c42b2265f4ed603600ec657b5972e Mon Sep 17 00:00:00 2001 From: kittapath Date: Wed, 22 Jan 2025 15:12:29 +0700 Subject: [PATCH] no message --- .../Controllers/PlacementController.cs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index b298fedc..5d41c228 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -2205,15 +2205,15 @@ namespace BMA.EHR.Placement.Service.Controllers p.PlacementEducations.FirstOrDefault().Degree, OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : p.nodeOld == "4" - ? p.positionNameOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "3" - ? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "2" - ? p.positionNameOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "1" - ? p.positionNameOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child1Old} {p.rootOld}" : p.nodeOld == "0" - ? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld} {p.rootOld}" : "-", + ? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld}/{p.rootOld}" : "-", OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionNumber = p.posMasterNoOld == null ? "-" : @@ -2436,15 +2436,15 @@ namespace BMA.EHR.Placement.Service.Controllers p.PlacementEducations.FirstOrDefault().Degree, OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : p.nodeOld == "4" - ? p.positionNameOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "3" - ? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "2" - ? p.positionNameOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "1" - ? p.positionNameOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child1Old} {p.rootOld}" : p.nodeOld == "0" - ? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld} {p.rootOld}" : "-", + ? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld}/{p.rootOld}" : "-", OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld, OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, @@ -2660,15 +2660,15 @@ namespace BMA.EHR.Placement.Service.Controllers p.PlacementEducations.FirstOrDefault().Degree, OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : p.nodeOld == "4" - ? p.positionNameOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "3" - ? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "2" - ? p.positionNameOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child2Old} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child2Old} {p.child1Old} {p.rootOld}" : p.nodeOld == "1" - ? p.positionNameOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child1Old} {p.rootOld}" : + ? p.positionNameOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionNameOld}/{p.child1Old} {p.rootOld}" : p.nodeOld == "0" - ? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld} {p.rootOld}" : "-", + ? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld}/{p.rootOld}" : "-", OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionNumber = p.posMasterNoOld == null ? "-" :