hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

#1271 (1) placement and retirement

Browse source
This commit is contained in:
AdisakKanthawilang 2025-03-24 15:36:28 +07:00
parent c1a20aca35
commit 6cb0ddff6b
11 changed files with 203 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

180
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -456,10 +456,10 @@ namespace BMA.EHR.Placement.Service.Controllers
placementAppointment.PositionLevelOld = org.result.posLevelName; placementAppointment.PositionLevelOld = org.result.posLevelName;
placementAppointment.PositionTypeOld = org.result.posTypeName; placementAppointment.PositionTypeOld = org.result.posTypeName;
placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld; placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld;
placementAppointment.AmountOld = org.result.salary; placementAppointment.AmountOld = org.result.salary;
@ -812,33 +812,23 @@ namespace BMA.EHR.Placement.Service.Controllers
No = r.Sequence.ToString().ToThaiNumber(), No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : OldOc = (p.positionOld == null ? "" : $"{p.positionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-",
OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = "-", LeaveDate = "-",
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : NewOc = (p.position == null ? "" : $"{p.position}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-",
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
NewPositionNumber = p.posMasterNo == null ? "-" : NewPositionNumber = p.posMasterNo == null ? "-" :
@ -1036,33 +1026,23 @@ namespace BMA.EHR.Placement.Service.Controllers
No = r.Sequence.ToString().ToThaiNumber(), No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : OldOc = (p.positionOld == null ? "" : $"{p.positionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-",
OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = "-", LeaveDate = "-",
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : NewOc = (p.position == null ? "" : $"{p.position}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-",
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
NewPositionNumber = p.posMasterNo == null ? "-" : NewPositionNumber = p.posMasterNo == null ? "-" :
@ -1262,31 +1242,21 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
No = r.Sequence.ToString().ToThaiNumber(), No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
OldOrganization = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : OldOrganization = (p.positionOld == null ? "" : $"{p.positionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-",
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld.ToThaiNumber(), OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld.ToThaiNumber(),
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : NewOc = (p.position == null ? "" : $"{p.position}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-",
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName.ToThaiNumber(), NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName.ToThaiNumber(),
NewPositionNumber = p.posMasterNo == null ? "-" : NewPositionNumber = p.posMasterNo == null ? "-" :
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() : p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
@ -1476,35 +1446,25 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
No = r.Sequence.ToString().ToThaiNumber(), No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : OldOc = (p.positionOld == null ? "" : $"{p.positionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{p.rootOld}"),
? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child2Old} {p.child1Old} {p.rootOld}" : OldPositionNumber = p.posMasterNoOld == null ? "-" :
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 ? "-" :
p.child4Old != null ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.child4Old != null ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
p.child3Old != null ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.child3Old != null ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
p.child2Old != null ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.child2Old != null ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
p.child1Old != null ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : p.child1Old != null ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : NewOc = (p.position == null ? "" : $"{p.position}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-",
NewPositionNumber = p.posMasterNo == null ? "-" : NewPositionNumber = p.posMasterNo == null ? "-" :
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() : p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 3 ? $"{p.child3ShortName}{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(), No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : OldOc = (p.positionOld == null ? "" : $"{p.positionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld} {p.rootOld}" : "-",
OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld,
OldPositionNumber = p.posMasterNoOld == null ? "-" : OldPositionNumber = p.posMasterNoOld == null ? "-" :
@ -1722,17 +1677,12 @@ namespace BMA.EHR.Placement.Service.Controllers
p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(), PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : NewOc = (p.position == null ? "" : $"{p.position}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-",
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
NewPositionNumber = p.posMasterNo == null ? "" : NewPositionNumber = p.posMasterNo == null ? "" :

8
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
View file

@ -483,10 +483,10 @@ namespace BMA.EHR.Placement.Service.Controllers
placementAppointment.PositionLevelOld = org.result.posLevelName; placementAppointment.PositionLevelOld = org.result.posLevelName;
placementAppointment.PositionTypeOld = org.result.posTypeName; placementAppointment.PositionTypeOld = org.result.posTypeName;
placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld; placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld;
} }

153
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -1628,17 +1628,12 @@ namespace BMA.EHR.Placement.Service.Controllers
PositionName = p.positionName == null ? "-" : p.positionName, PositionName = p.positionName == null ? "-" : p.positionName,
ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(), 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}/-" : Oc = (p.positionName == null ? "" : $"{p.positionName}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-",
PositionType = p.posTypeName == null ? "-" : p.posTypeName, PositionType = p.posTypeName == null ? "-" : p.posTypeName,
PositionLevel = p.posLevelName == null ? "-" : p.posLevelName, PositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
PositionNumber = p.posMasterNo == null ? "-" : 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(), CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
OccupationPosition = p.OccupationPosition == null ? "-" : p.OccupationPosition, //ตำแหน่งเก่าก่อนสอบ OccupationPosition = p.OccupationPosition == null ? "-" : p.OccupationPosition, //ตำแหน่งเก่าก่อนสอบ
PositionCandidate = p.PositionCandidate, //ตำแหน่งที่สอบแข่งขัน PositionCandidate = p.PositionCandidate, //ตำแหน่งที่สอบแข่งขัน
OcCandidate = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : OcCandidate = (p.positionName == null ? "" : $"{p.positionName}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-",
RemarkHorizontal = r.RemarkHorizontal, RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical, RemarkVertical = r.RemarkVertical,
}).ToList(); }).ToList();
@ -1968,17 +1958,12 @@ namespace BMA.EHR.Placement.Service.Controllers
PositionName = p.positionName == null ? "-" : p.positionName, PositionName = p.positionName == null ? "-" : p.positionName,
ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(), 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}/-" : Oc = (p.positionName == null ? "" : $"{p.positionName}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-",
PositionType = p.posTypeName == null ? "-" : p.posTypeName, PositionType = p.posTypeName == null ? "-" : p.posTypeName,
PositionLevel = p.posLevelName == null ? "-" : p.posLevelName, PositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
PositionNumber = p.posMasterNo == null ? "-" : PositionNumber = p.posMasterNo == null ? "-" :
@ -2296,17 +2281,12 @@ namespace BMA.EHR.Placement.Service.Controllers
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" : Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree, p.PlacementEducations.FirstOrDefault().Degree,
OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
p.nodeOld == "4" (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old == null ? "" : $"{p.child3Old}\n") +
p.nodeOld == "3" (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.nodeOld == "2" (p.rootOld == null ? "" : $"{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.nodeOld == "0"
? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld} {p.rootOld}" : "-",
OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld,
OldPositionNumber = p.posMasterNoOld == null ? "-" : OldPositionNumber = p.posMasterNoOld == null ? "-" :
@ -2317,17 +2297,12 @@ namespace BMA.EHR.Placement.Service.Controllers
p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld, OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld,
NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-",
NewPosition = p.positionName == null ? "-" : p.positionName, NewPosition = p.positionName == null ? "-" : p.positionName,
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
@ -2536,17 +2511,12 @@ namespace BMA.EHR.Placement.Service.Controllers
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" : Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree, p.PlacementEducations.FirstOrDefault().Degree,
OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
p.nodeOld == "4" (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old == null ? "" : $"{p.child3Old}\n") +
p.nodeOld == "3" (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.nodeOld == "2" (p.rootOld == null ? "" : $"{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.nodeOld == "0"
? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld} {p.rootOld}" : "-",
OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld, OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld,
OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, 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 == "1" ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-",
NewPosition = p.positionName == null ? "-" : p.positionName, NewPosition = p.positionName == null ? "-" : p.positionName,
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
@ -2765,17 +2730,12 @@ namespace BMA.EHR.Placement.Service.Controllers
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" : Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree, p.PlacementEducations.FirstOrDefault().Degree,
OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
p.nodeOld == "4" (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old == null ? "" : $"{p.child3Old}\n") +
p.nodeOld == "3" (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.positionNameOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionNameOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.nodeOld == "2" (p.rootOld == null ? "" : $"{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.nodeOld == "0"
? p.positionNameOld == null ? $"{p.rootOld}" : $"{p.positionNameOld} {p.rootOld}" : "-",
OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld, OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld, OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld,
OldPositionNumber = p.posMasterNoOld == null ? "-" : OldPositionNumber = p.posMasterNoOld == null ? "-" :
@ -2786,17 +2746,12 @@ namespace BMA.EHR.Placement.Service.Controllers
p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-", p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
OldSalary = p.Amount == null ? "-" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.Amount == null ? "-" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = "-", LeaveDate = "-",
NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.positionName == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.positionName} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-",
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
NewPositionNumber = p.posMasterNo == null ? "-" : NewPositionNumber = p.posMasterNo == null ? "-" :

25
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -406,10 +406,10 @@ namespace BMA.EHR.Placement.Service.Controllers
placementOfficer.PositionLevelOld = org.result.posLevelName; placementOfficer.PositionLevelOld = org.result.posLevelName;
placementOfficer.PositionTypeOld = org.result.posTypeName; placementOfficer.PositionTypeOld = org.result.posTypeName;
placementOfficer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; placementOfficer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementOfficer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + placementOfficer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementOfficer.OrganizationPositionOld = org.result.position + "\n" + placementOfficer.OrganizationOld; placementOfficer.OrganizationPositionOld = org.result.position + "\n" + placementOfficer.OrganizationOld;
} }
@ -614,17 +614,12 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
No = r.Sequence.ToString().ToThaiNumber(), No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : PositionName = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-",
Organization = p.Organization == null ? "" : p.Organization, Organization = p.Organization == null ? "" : p.Organization,
StartDate = p.DateStart == null ? "" : p.DateStart.Value.ToThaiShortDate2().ToThaiNumber(), StartDate = p.DateStart == null ? "" : p.DateStart.Value.ToThaiShortDate2().ToThaiNumber(),
EndDate = p.DateEnd == null ? "" : p.DateEnd.Value.ToThaiShortDate2().ToThaiNumber(), EndDate = p.DateEnd == null ? "" : p.DateEnd.Value.ToThaiShortDate2().ToThaiNumber(),

34
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -939,31 +939,21 @@ namespace BMA.EHR.Placement.Service.Controllers
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOrg = p.OrganizationPositionOld ?? "-", OldOrg = p.OrganizationPositionOld ?? "-",
OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-",
OldPositionType = p.PositionTypeOld ?? "-", OldPositionType = p.PositionTypeOld ?? "-",
OldPositionLevel = p.PositionLevelOld ?? "-", OldPositionLevel = p.PositionLevelOld ?? "-",
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : NewOc = (p.position == null ? "" : $"{p.position}\n") +
p.node == 4 (p.child4 == null ? "" : $"{p.child4}\n") +
? 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.child3 == null ? "" : $"{p.child3}\n") +
p.node == 3 (p.child2 == null ? "" : $"{p.child2}\n") +
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" : (p.child1 == null ? "" : $"{p.child1}\n") +
p.node == 2 (p.root == null ? "" : $"{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.node == 0
? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-",
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
NewPositionNumber = p.posMasterNo == null ? "-" : NewPositionNumber = p.posMasterNo == null ? "-" :

17
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -805,17 +805,12 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
No = r.Sequence.ToString().ToThaiNumber(), No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-",
PositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, PositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
PositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, PositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),

16
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -595,10 +595,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName; retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName;
retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId; retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId;
retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position; retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position;
retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + " ") + retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti); retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti);
} }
@ -624,10 +624,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName; retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName;
retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId; retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId;
retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position; retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position;
retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + " ") + retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti); retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti);
} }

42
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -325,10 +325,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.PositionLevelOld = org.result.posLevelName; retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName; retirementOther.PositionTypeOld = org.result.posTypeName;
retirementOther.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; retirementOther.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementOther.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + retirementOther.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementOther.OrganizationPositionOld = org.result.position + "\n" + retirementOther.OrganizationOld; retirementOther.OrganizationPositionOld = org.result.position + "\n" + retirementOther.OrganizationOld;
retirementOther.EducationOld = org.result.education; retirementOther.EducationOld = org.result.education;
@ -825,34 +825,24 @@ namespace BMA.EHR.Retirement.Service.Controllers
No = r.Sequence.ToString().ToThaiNumber(), No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-",
OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(), LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(), MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : NewOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-",
NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),

16
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -302,10 +302,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOut.PositionLevelOld = org.result.posLevelName; retirementOut.PositionLevelOld = org.result.posLevelName;
retirementOut.PositionTypeOld = org.result.posTypeName; retirementOut.PositionTypeOld = org.result.posTypeName;
retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld; retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld;
retirementOut.AmountOld = org.result.salary; retirementOut.AmountOld = org.result.salary;
@ -357,10 +357,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOut.PositionLevelOld = org.result.posLevelName; retirementOut.PositionLevelOld = org.result.posLevelName;
retirementOut.PositionTypeOld = org.result.posTypeName; retirementOut.PositionTypeOld = org.result.posTypeName;
retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld; retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld;
retirementOut.AmountOld = org.result.salary; retirementOut.AmountOld = org.result.salary;

25
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -943,10 +943,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResign.PositionLevelOld = org.result.posLevelName; retirementResign.PositionLevelOld = org.result.posLevelName;
retirementResign.PositionTypeOld = org.result.posTypeName; retirementResign.PositionTypeOld = org.result.posTypeName;
retirementResign.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; retirementResign.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementResign.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + retirementResign.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementResign.OrganizationPositionOld = org.result.position + "\n" + retirementResign.OrganizationOld; 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}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.PositionOld ?? "-", PositionName = p.PositionOld ?? "-",
Organization = p.OrganizationPositionOld ?? "-", Organization = p.OrganizationPositionOld ?? "-",
Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
p.child4Old != null (p.child4Old == null ? "" : $"{p.child4Old}\n") +
? 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.child3Old}\n") +
p.child3Old != null (p.child2Old == null ? "" : $"{p.child2Old}\n") +
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.child1Old == null ? "" : $"{p.child1Old}\n") +
p.child2Old != null (p.rootOld == null ? "" : $"{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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-",
PositionLevel = p.PositionLevelOld ?? "-", PositionLevel = p.PositionLevelOld ?? "-",
PositionType = p.PositionTypeOld ?? "-", PositionType = p.PositionTypeOld ?? "-",
PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),

26
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -878,10 +878,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResignEmployee.PositionLevelOld = org.result.posLevelName; retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
retirementResignEmployee.PositionTypeOld = org.result.posTypeName; retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
retirementResignEmployee.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; retirementResignEmployee.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") + retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + " ") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + " ") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + " ") + (org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementResignEmployee.OrganizationPositionOld = org.result.position + "\n" + retirementResignEmployee.OrganizationOld; 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(), CitizenId = r.CitizenId == null ? "-" : r.CitizenId.ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.PositionOld ?? "-", PositionName = p.PositionOld ?? "-",
Organization = p.OrganizationPositionOld ?? "-", Organization = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : (p.child4Old == null ? "" : $"{p.child4Old}\n") +
p.child4Old != null (p.child3Old == null ? "" : $"{p.child3Old}\n") +
? 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.child2Old == null ? "" : $"{p.child2Old}\n") +
p.child3Old != null (p.child1Old == null ? "" : $"{p.child1Old}\n") +
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : (p.rootOld == null ? "" : $"{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}" : "-",
PositionLevel = p.PositionLevelOld ?? "-", PositionLevel = p.PositionLevelOld ?? "-",
PositionType = p.PositionTypeOld ?? "-", PositionType = p.PositionTypeOld ?? "-",
PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),