From 6cb0ddff6bab8592094f71d2ef1e2f4f6ef306cf Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 24 Mar 2025 15:36:28 +0700 Subject: [PATCH] #1271 (1) placement and retirement --- .../PlacementAppointmentController.cs | 180 +++++++----------- .../PlacementAppointmentEmployeeController.cs | 8 +- .../Controllers/PlacementController.cs | 153 ++++++--------- .../Controllers/PlacementOfficerController.cs | 25 +-- .../Controllers/PlacementReceiveController.cs | 34 ++-- .../PlacementTransferController.cs | 17 +- .../RetirementDeceasedController.cs | 16 +- .../Controllers/RetirementOtherController.cs | 42 ++-- .../Controllers/RetirementOutController.cs | 16 +- .../Controllers/RetirementResignController.cs | 25 +-- .../RetirementResignEmployeeController.cs | 26 +-- 11 files changed, 203 insertions(+), 339 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 8238d127..55406e64 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -456,10 +456,10 @@ namespace BMA.EHR.Placement.Service.Controllers placementAppointment.PositionLevelOld = org.result.posLevelName; placementAppointment.PositionTypeOld = org.result.posTypeName; placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld; placementAppointment.AmountOld = org.result.salary; @@ -812,33 +812,23 @@ namespace BMA.EHR.Placement.Service.Controllers No = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Education = p.EducationOld == null ? "-" : p.EducationOld, - OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : - p.child4Old != null - ? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", + OldOc = (p.positionOld == null ? "" : $"{p.positionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), LeaveDate = "-", - NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : - p.node == 4 - ? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : - p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", + NewOc = (p.position == null ? "" : $"{p.position}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionNumber = p.posMasterNo == null ? "-" : @@ -1036,33 +1026,23 @@ namespace BMA.EHR.Placement.Service.Controllers No = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Education = p.EducationOld == null ? "-" : p.EducationOld, - OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : - p.child4Old != null - ? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", + OldOc = (p.positionOld == null ? "" : $"{p.positionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), LeaveDate = "-", - NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : - p.node == 4 - ? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : - p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", + NewOc = (p.position == null ? "" : $"{p.position}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionNumber = p.posMasterNo == null ? "-" : @@ -1262,31 +1242,21 @@ namespace BMA.EHR.Placement.Service.Controllers { No = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", - OldOrganization = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : - p.child4Old != null - ? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", + OldOrganization = (p.positionOld == null ? "" : $"{p.positionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld.ToThaiNumber(), OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), - NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : - p.node == 4 - ? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : - p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", + NewOc = (p.position == null ? "" : $"{p.position}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName.ToThaiNumber(), NewPositionNumber = p.posMasterNo == null ? "-" : p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() : @@ -1476,35 +1446,25 @@ namespace BMA.EHR.Placement.Service.Controllers { No = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", - OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : - p.child4Old != null - ? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", - OldPositionNumber = p.posMasterNoOld == null ? "-" : + OldOc = (p.positionOld == null ? "" : $"{p.positionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), + OldPositionNumber = p.posMasterNoOld == null ? "-" : p.child4Old != null ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.child3Old != null ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.child2Old != null ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.child1Old != null ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), - NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : - p.node == 4 - ? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : - p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", + NewOc = (p.position == null ? "" : $"{p.position}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPositionNumber = p.posMasterNo == null ? "-" : p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() : p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() : @@ -1701,17 +1661,12 @@ namespace BMA.EHR.Placement.Service.Controllers No = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Education = p.EducationOld == null ? "-" : p.EducationOld, - OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : - p.child4Old != null - ? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", + OldOc = (p.positionOld == null ? "" : $"{p.positionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionNumber = p.posMasterNoOld == null ? "-" : @@ -1722,17 +1677,12 @@ namespace BMA.EHR.Placement.Service.Controllers p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(), - NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : - p.node == 4 - ? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : - p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", + NewOc = (p.position == null ? "" : $"{p.position}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionNumber = p.posMasterNo == null ? "" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs index ae52a64a..227448d9 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs @@ -483,10 +483,10 @@ namespace BMA.EHR.Placement.Service.Controllers placementAppointment.PositionLevelOld = org.result.posLevelName; placementAppointment.PositionTypeOld = org.result.posTypeName; placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld; } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 8fe4064d..f47673e8 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1628,17 +1628,12 @@ namespace BMA.EHR.Placement.Service.Controllers PositionName = p.positionName == null ? "-" : p.positionName, ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(), PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()} {p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}", - Oc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : - p.node == 4 - ? p.positionName == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.positionName == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : - p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", + Oc = (p.positionName == null ? "" : $"{p.positionName}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), PositionType = p.posTypeName == null ? "-" : p.posTypeName, PositionLevel = p.posLevelName == null ? "-" : p.posLevelName, PositionNumber = p.posMasterNo == null ? "-" : @@ -1652,17 +1647,12 @@ namespace BMA.EHR.Placement.Service.Controllers CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(), OccupationPosition = p.OccupationPosition == null ? "-" : p.OccupationPosition, //ตำแหน่งเก่าก่อนสอบ PositionCandidate = p.PositionCandidate, //ตำแหน่งที่สอบแข่งขัน - OcCandidate = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : - p.node == 4 - ? p.positionName == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.positionName == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : - p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", + OcCandidate = (p.positionName == null ? "" : $"{p.positionName}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), RemarkHorizontal = r.RemarkHorizontal, RemarkVertical = r.RemarkVertical, }).ToList(); @@ -1968,17 +1958,12 @@ namespace BMA.EHR.Placement.Service.Controllers PositionName = p.positionName == null ? "-" : p.positionName, ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(), PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()} {p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}", - Oc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : - p.node == 4 - ? p.positionName == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.positionName == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : - p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", + Oc = (p.positionName == null ? "" : $"{p.positionName}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), PositionType = p.posTypeName == null ? "-" : p.posTypeName, PositionLevel = p.posLevelName == null ? "-" : p.posLevelName, PositionNumber = p.posMasterNo == null ? "-" : @@ -2296,17 +2281,12 @@ namespace BMA.EHR.Placement.Service.Controllers FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" : 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.nodeOld == "3" - ? 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.nodeOld == "1" - ? 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}" : "-", + OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionNumber = p.posMasterNoOld == null ? "-" : @@ -2317,17 +2297,12 @@ namespace BMA.EHR.Placement.Service.Controllers p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld, - NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : - p.node == 4 - ? p.positionName == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.positionName == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : - p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", + NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPosition = p.positionName == null ? "-" : p.positionName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, @@ -2536,17 +2511,12 @@ namespace BMA.EHR.Placement.Service.Controllers FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" : 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.nodeOld == "3" - ? 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.nodeOld == "1" - ? 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}" : "-", + OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld, OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, @@ -2557,17 +2527,12 @@ namespace BMA.EHR.Placement.Service.Controllers p.nodeOld == "1" ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), - NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : - p.node == 4 - ? p.positionName == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.positionName == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : - p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", + NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPosition = p.positionName == null ? "-" : p.positionName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, @@ -2765,17 +2730,12 @@ namespace BMA.EHR.Placement.Service.Controllers FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" : 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.nodeOld == "3" - ? 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.nodeOld == "1" - ? 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}" : "-", + OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionNumber = p.posMasterNoOld == null ? "-" : @@ -2786,17 +2746,12 @@ namespace BMA.EHR.Placement.Service.Controllers p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", OldSalary = p.Amount == null ? "-" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), LeaveDate = "-", - NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : - p.node == 4 - ? p.positionName == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.positionName == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : - p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", + NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionNumber = p.posMasterNo == null ? "-" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 06324c54..bd34d64a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -406,10 +406,10 @@ namespace BMA.EHR.Placement.Service.Controllers placementOfficer.PositionLevelOld = org.result.posLevelName; placementOfficer.PositionTypeOld = org.result.posTypeName; placementOfficer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - placementOfficer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + placementOfficer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); placementOfficer.OrganizationPositionOld = org.result.position + "\n" + placementOfficer.OrganizationOld; } @@ -614,17 +614,12 @@ namespace BMA.EHR.Placement.Service.Controllers { No = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", - PositionName = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : - p.child4Old != null - ? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", + PositionName = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), Organization = p.Organization == null ? "" : p.Organization, StartDate = p.DateStart == null ? "" : p.DateStart.Value.ToThaiShortDate2().ToThaiNumber(), EndDate = p.DateEnd == null ? "" : p.DateEnd.Value.ToThaiShortDate2().ToThaiNumber(), diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 31a1b4b2..99bf35eb 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -939,31 +939,21 @@ namespace BMA.EHR.Placement.Service.Controllers FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Education = p.EducationOld == null ? "-" : p.EducationOld, OldOrg = p.OrganizationPositionOld ?? "-", - OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : - p.child4Old != null - ? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", + OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPositionType = p.PositionTypeOld ?? "-", OldPositionLevel = p.PositionLevelOld ?? "-", OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), - NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : - p.node == 4 - ? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 3 - ? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : - p.node == 2 - ? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position} {p.child2} {p.child1} {p.root}" : - p.node == 1 - ? p.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : - p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", + NewOc = (p.position == null ? "" : $"{p.position}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionNumber = p.posMasterNo == null ? "-" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 589fd9f7..eb8c5315 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -805,17 +805,12 @@ namespace BMA.EHR.Placement.Service.Controllers { No = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", - OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : - p.child4Old != null - ? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", + OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), PositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, PositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs index 301a32f6..dca86be2 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs @@ -595,10 +595,10 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName; retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId; retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position; - retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti); } @@ -624,10 +624,10 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName; retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId; retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position; - retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index c6372bad..61608786 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -325,10 +325,10 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementOther.PositionLevelOld = org.result.posLevelName; retirementOther.PositionTypeOld = org.result.posTypeName; retirementOther.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - retirementOther.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + retirementOther.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); retirementOther.OrganizationPositionOld = org.result.position + "\n" + retirementOther.OrganizationOld; retirementOther.EducationOld = org.result.education; @@ -825,34 +825,24 @@ namespace BMA.EHR.Retirement.Service.Controllers No = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Education = p.EducationOld == null ? "-" : p.EducationOld, - OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : - p.child4Old != null - ? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", + OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(), MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(), - NewOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : - p.child4Old != null - ? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", + NewOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index c95d9f2c..356ee3eb 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -302,10 +302,10 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementOut.PositionLevelOld = org.result.posLevelName; retirementOut.PositionTypeOld = org.result.posTypeName; retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld; retirementOut.AmountOld = org.result.salary; @@ -357,10 +357,10 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementOut.PositionLevelOld = org.result.posLevelName; retirementOut.PositionTypeOld = org.result.posTypeName; retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld; retirementOut.AmountOld = org.result.salary; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 9e310a2c..eec2d627 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -943,10 +943,10 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementResign.PositionLevelOld = org.result.posLevelName; retirementResign.PositionTypeOld = org.result.posTypeName; retirementResign.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - retirementResign.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + retirementResign.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); retirementResign.OrganizationPositionOld = org.result.position + "\n" + retirementResign.OrganizationOld; } @@ -2357,17 +2357,12 @@ namespace BMA.EHR.Retirement.Service.Controllers FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PositionName = p.PositionOld ?? "-", Organization = p.OrganizationPositionOld ?? "-", - Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : - p.child4Old != null - ? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", + Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), PositionLevel = p.PositionLevelOld ?? "-", PositionType = p.PositionTypeOld ?? "-", PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 51090c8b..3c514ec4 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -878,10 +878,10 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementResignEmployee.PositionLevelOld = org.result.posLevelName; retirementResignEmployee.PositionTypeOld = org.result.posTypeName; retirementResignEmployee.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + - (org.result.child3 == null ? "" : org.result.child3 + " ") + - (org.result.child2 == null ? "" : org.result.child2 + " ") + - (org.result.child1 == null ? "" : org.result.child1 + " ") + + retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + + (org.result.child3 == null ? "" : org.result.child3 + "\n") + + (org.result.child2 == null ? "" : org.result.child2 + "\n") + + (org.result.child1 == null ? "" : org.result.child1 + "\n") + (org.result.root == null ? "" : org.result.root); retirementResignEmployee.OrganizationPositionOld = org.result.position + "\n" + retirementResignEmployee.OrganizationOld; } @@ -1796,18 +1796,12 @@ namespace BMA.EHR.Retirement.Service.Controllers CitizenId = r.CitizenId == null ? "-" : r.CitizenId.ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PositionName = p.PositionOld ?? "-", - Organization = p.OrganizationPositionOld ?? "-", - Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : - p.child4Old != null - ? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child3Old != null - ? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child2Old != null - ? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : - p.child1Old != null - ? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : - p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", + Organization = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") + + (p.child4Old == null ? "" : $"{p.child4Old}\n") + + (p.child3Old == null ? "" : $"{p.child3Old}\n") + + (p.child2Old == null ? "" : $"{p.child2Old}\n") + + (p.child1Old == null ? "" : $"{p.child1Old}\n") + + (p.rootOld == null ? "" : $"{p.rootOld}"), PositionLevel = p.PositionLevelOld ?? "-", PositionType = p.PositionTypeOld ?? "-", PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),