diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs index fafa806a..ad95788a 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs @@ -519,7 +519,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers posTypeName = p.posTypeName, posLevelId = p.posLevelId, posLevelName = p.posLevelName, - + IsSend = p.IsReport, IsSuspend = p.IsSuspend, Status = p.Status, @@ -1745,10 +1745,10 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers FirstName = item.FirstName, LastName = item.LastName, //Organization = item.Organization, - Organization = (item.child4 == null ? "" : item.child4 + "/") + - (item.child3 == null ? "" : item.child3 + "/") + - (item.child2 == null ? "" : item.child2 + "/") + - (item.child1 == null ? "" : item.child1 + "/") + + Organization = (item.child4 == null ? "" : item.child4 + " ") + + (item.child3 == null ? "" : item.child3 + " ") + + (item.child2 == null ? "" : item.child2 + " ") + + (item.child1 == null ? "" : item.child1 + " ") + (item.root == null ? "" : item.root), root = item.root, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 51bec560..ee60e8d9 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -449,12 +449,12 @@ 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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); - placementAppointment.OrganizationPositionOld = org.result.position + "/" + placementAppointment.OrganizationOld; + placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld; placementAppointment.AmountOld = org.result.salary; } await _context.PlacementAppointments.AddAsync(placementAppointment); @@ -798,15 +798,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-", + ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), @@ -814,15 +814,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-", + ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionNumber = p.posMasterNo == null ? "-" : @@ -1013,15 +1013,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-", + ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), @@ -1029,15 +1029,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-", + ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionNumber = p.posMasterNo == null ? "-" : @@ -1230,29 +1230,29 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-", + ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {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.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.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.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.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-", + ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName.ToThaiNumber(), NewPositionNumber = p.posMasterNo == null ? "-" : p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() : @@ -1433,15 +1433,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-", + ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", OldPositionNumber = p.posMasterNoOld == null ? "-" : p.child4Old != null ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.child3Old != null ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : @@ -1451,15 +1451,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-", + ? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-", NewPositionNumber = p.posMasterNo == null ? "-" : p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() : p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() : @@ -1647,15 +1647,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-", + ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-", OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionNumber = p.posMasterNoOld == null ? "-" : @@ -1668,15 +1668,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-", + ? p.position == null ? $"{p.root}" : $"{p.position} {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 d0b4dd9c..ed223f86 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs @@ -481,12 +481,12 @@ 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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); - placementAppointment.OrganizationPositionOld = org.result.position + "/" + placementAppointment.OrganizationOld; + placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld; } await _context.PlacementAppointments.AddAsync(placementAppointment); await _context.SaveChangesAsync(); diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 34597431..b298fedc 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1576,18 +1576,18 @@ namespace BMA.EHR.Placement.Service.Controllers $"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}", 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()}", + 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.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.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.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.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName}/{p.root}" : "-", + ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", PositionType = p.posTypeName == null ? "-" : p.posTypeName, PositionLevel = p.posLevelName == null ? "-" : p.posLevelName, PositionNumber = p.posMasterNo == null ? "-" : @@ -1603,15 +1603,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName}/{p.root}" : "-", + ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", RemarkHorizontal = r.RemarkHorizontal, RemarkVertical = r.RemarkVertical, }).ToList(); @@ -1896,18 +1896,18 @@ namespace BMA.EHR.Placement.Service.Controllers $"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}", 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()}", + 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.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.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.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.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName}/{p.root}" : "-", + ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", PositionType = p.posTypeName == null ? "-" : p.posTypeName, PositionLevel = p.posLevelName == null ? "-" : p.posLevelName, PositionNumber = p.posMasterNo == null ? "-" : @@ -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 ? "-" : @@ -2226,15 +2226,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName}/{p.root}" : "-", + ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", NewPosition = p.positionName == null ? "-" : p.positionName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, @@ -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, @@ -2457,15 +2457,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName}/{p.root}" : "-", + ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-", NewPosition = p.positionName == null ? "-" : p.positionName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, @@ -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 ? "-" : @@ -2681,15 +2681,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.positionName == null ? $"{p.child1} {p.root}" : $"{p.positionName} {p.child1} {p.root}" : p.node == 0 - ? p.positionName == null ? $"{p.root}" : $"{p.positionName}/{p.root}" : "-", + ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {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 47827a44..9db7af70 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -395,12 +395,12 @@ 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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); - placementOfficer.OrganizationPositionOld = org.result.position + "/" + placementOfficer.OrganizationOld; + placementOfficer.OrganizationPositionOld = org.result.position + "\n" + placementOfficer.OrganizationOld; } await _context.PlacementOfficers.AddAsync(placementOfficer); await _context.SaveChangesAsync(); @@ -605,15 +605,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", + ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {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 3ec81c32..0676d102 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -495,12 +495,12 @@ namespace BMA.EHR.Placement.Service.Controllers placementReceive.PositionLevelOld = org.result.posLevelName; placementReceive.PositionTypeOld = org.result.posTypeName; placementReceive.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - placementReceive.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 + "/") + + placementReceive.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 + " ") + (org.result.root == null ? "" : org.result.root); - placementReceive.OrganizationPositionOld = org.result.position + "/" + placementReceive.OrganizationOld; + placementReceive.OrganizationPositionOld = org.result.position + "\n" + placementReceive.OrganizationOld; } } await _context.PlacementReceives.AddAsync(placementReceive); @@ -930,29 +930,29 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", + ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {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.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.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.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.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" : p.node == 0 - ? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-", + ? p.position == null ? $"{p.root}" : $"{p.position} {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/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index 20d4dd84..7db7fec8 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -273,12 +273,12 @@ namespace BMA.EHR.Placement.Service.Controllers placementRepatriation.PositionLevelOld = org.result.posLevelName; placementRepatriation.PositionTypeOld = org.result.posTypeName; placementRepatriation.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - placementRepatriation.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 + "/") + + placementRepatriation.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 + " ") + (org.result.root == null ? "" : org.result.root); - placementRepatriation.OrganizationPositionOld = org.result.position + "/" + placementRepatriation.OrganizationOld; + placementRepatriation.OrganizationPositionOld = org.result.position + "\n" + placementRepatriation.OrganizationOld; } await _context.PlacementRepatriations.AddAsync(placementRepatriation); await _context.SaveChangesAsync(); diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 90e61efe..b9adcb9a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -524,12 +524,12 @@ namespace BMA.EHR.Placement.Service.Controllers placementTransfer.PositionLevelOld = org.result.posLevelName; placementTransfer.PositionTypeOld = org.result.posTypeName; placementTransfer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; - placementTransfer.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 + "/") + + placementTransfer.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 + " ") + (org.result.root == null ? "" : org.result.root); - placementTransfer.OrganizationPositionOld = org.result.position + "/" + placementTransfer.OrganizationOld; + placementTransfer.OrganizationPositionOld = org.result.position + "\n" + placementTransfer.OrganizationOld; } await _context.PlacementTransfers.AddAsync(placementTransfer); await _context.SaveChangesAsync(); @@ -811,15 +811,15 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.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.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.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", + ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {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.Report.Service/Controllers/RetireReportController.cs b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs index 56dd83af..dd329dde 100644 --- a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs @@ -133,10 +133,10 @@ namespace BMA.EHR.Report.Service.Controllers // thaiOrder = $"ลำดับที่ {thaiOrder.ToThaiNumber()}"; // string thaiPosNo = profile.GetType().GetProperty("posNo").GetValue(profile); // thaiPosNo = thaiPosNo != null ? $"(ตำแหน่งเลขที่ {thaiPosNo.ToThaiNumber()})" : $"(ตำแหน่งเลขที่ - )"; - // string organizationOrganization = (profile.GetType().GetProperty("child4").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child4").GetValue(profile) + "/") + - // (profile.GetType().GetProperty("child3").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child3").GetValue(profile) + "/") + - // (profile.GetType().GetProperty("child2").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child2").GetValue(profile) + "/") + - // (profile.GetType().GetProperty("child1").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child1").GetValue(profile) + "/") + + // string organizationOrganization = (profile.GetType().GetProperty("child4").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child4").GetValue(profile) + " ") + + // (profile.GetType().GetProperty("child3").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child3").GetValue(profile) + " ") + + // (profile.GetType().GetProperty("child2").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child2").GetValue(profile) + " ") + + // (profile.GetType().GetProperty("child1").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child1").GetValue(profile) + " ") + // (profile.GetType().GetProperty("root").GetValue(profile) == null ? "" : profile.GetType().GetProperty("root").GetValue(profile)); // string reason = profile.GetType().GetProperty("reason").GetValue(profile); // organizationOrganization = organizationOrganization != string.Empty ? organizationOrganization : reason != string.Empty ? reason : string.Empty ; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs index ad24d463..9ebcf854 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs @@ -590,10 +590,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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti); } @@ -619,10 +619,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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (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 6bfb98e4..97580f4e 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -396,12 +396,12 @@ 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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); - retirementOther.OrganizationPositionOld = org.result.position + "/" + retirementOther.OrganizationOld; + retirementOther.OrganizationPositionOld = org.result.position + "\n" + retirementOther.OrganizationOld; retirementOther.EducationOld = org.result.education; retirementOther.AmountOld = org.result.salary; } @@ -698,13 +698,13 @@ 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.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "/" + (p.rootOld == null ? "" : p.rootOld), + OldOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "\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(), - NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "/" + (p.rootOld == null ? "" : p.rootOld), + NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "\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(), @@ -888,15 +888,15 @@ namespace BMA.EHR.Retirement.Service.Controllers 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.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.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.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.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", + ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), @@ -905,15 +905,15 @@ namespace BMA.EHR.Retirement.Service.Controllers 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.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.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.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.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", + ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {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 17b609a5..f63713b3 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -316,12 +316,12 @@ 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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); - retirementOut.OrganizationPositionOld = org.result.position + "/" + retirementOut.OrganizationOld; + retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld; retirementOut.AmountOld = org.result.salary; } } @@ -371,12 +371,12 @@ 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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); - retirementOut.OrganizationPositionOld = org.result.position + "/" + retirementOut.OrganizationOld; + 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 6ce2d732..10a83322 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -100,7 +100,7 @@ namespace BMA.EHR.Retirement.Service.Controllers // var ret = String.Empty; // foreach (var oc in ocList) // { - // ret = oc + "/" + ret; + // ret = oc + "\n" + ret; // } // if (ret.Length > 2) @@ -511,9 +511,9 @@ namespace BMA.EHR.Retirement.Service.Controllers data.IsNoBurden, data.IsDiscipline, data.CancelReason, - idCancel = data.RetirementResignCancels?.Id ?? Guid.Empty, + idCancel = data.RetirementResignCancels?.Id ?? null, statusCancel = data.RetirementResignCancels?.Status ?? null, - statusMain = data.Status, + statusMain = data.Status == "CANCEL" ? "DONECANCEL" : data.Status, // Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), Docs = retirementResignDocs, // DocDebts = retirementResignDebtDocs, @@ -952,12 +952,12 @@ 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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); - retirementResign.OrganizationPositionOld = org.result.position + "/" + retirementResign.OrganizationOld; + retirementResign.OrganizationPositionOld = org.result.position + "\n" + retirementResign.OrganizationOld; } await _context.RetirementResigns.AddAsync(retirementResign); await _context.SaveChangesAsync(); @@ -1261,43 +1261,7 @@ namespace BMA.EHR.Retirement.Service.Controllers } updated.IsCancel = true; } - // else - // { updated.Status = "CANCEL"; - // } - // if (updated.OfficerReject != null) - // { - // await _repositoryNoti.PushNotificationAsync( - // Guid.Parse("08dc3db9-257d-470d-8256-3dc24f6fa332"), - // $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก", - // $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก", - // "", - // "", - // true - // ); - // } - // if (updated.CommanderReject != null) - // { - // await _repositoryNoti.PushNotificationAsync( - // Guid.Parse("08dc432c-2bc5-4b81-8089-9c057c51192c"), - // $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก", - // $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก", - // "", - // "", - // true - // ); - // } - // if (updated.OligarchReject != null) - // { - // await _repositoryNoti.PushNotificationAsync( - // Guid.Parse("08dc4307-0adc-4bcd-8213-5479bb010236"), - // $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก", - // $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก", - // "", - // "", - // true - // ); - // } updated.LastUpdateFullName = FullName ?? "System Administrator"; updated.LastUpdateUserId = UserId ?? ""; updated.LastUpdatedAt = DateTime.Now; @@ -2558,15 +2522,15 @@ namespace BMA.EHR.Retirement.Service.Controllers 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.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.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.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.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", + ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {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 b92bc974..b484414c 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -894,12 +894,12 @@ 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 + " ") + + (org.result.child3 == null ? "" : org.result.child3 + " ") + + (org.result.child2 == null ? "" : org.result.child2 + " ") + + (org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.root == null ? "" : org.result.root); - retirementResignEmployee.OrganizationPositionOld = org.result.position + "/" + retirementResignEmployee.OrganizationOld; + retirementResignEmployee.OrganizationPositionOld = org.result.position + "\n" + retirementResignEmployee.OrganizationOld; } await _context.RetirementResignEmployees.AddAsync(retirementResignEmployee); await _context.SaveChangesAsync(); @@ -2500,15 +2500,15 @@ namespace BMA.EHR.Retirement.Service.Controllers 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.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.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.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.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" : p.rootOld != null - ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", + ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-", PositionLevel = p.PositionLevelOld ?? "-", PositionType = p.PositionTypeOld ?? "-", PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),