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

edit display org
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
kittapath 2025-01-22 15:10:34 +07:00
parent 50b3dde54e
commit 92e6d1ebfc
14 changed files with 181 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -519,7 +519,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
posTypeName = p.posTypeName, posTypeName = p.posTypeName,
posLevelId = p.posLevelId, posLevelId = p.posLevelId,
posLevelName = p.posLevelName, posLevelName = p.posLevelName,
IsSend = p.IsReport, IsSend = p.IsReport,
IsSuspend = p.IsSuspend, IsSuspend = p.IsSuspend,
Status = p.Status, Status = p.Status,
@ -1745,10 +1745,10 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
FirstName = item.FirstName, FirstName = item.FirstName,
LastName = item.LastName, LastName = item.LastName,
//Organization = item.Organization, //Organization = item.Organization,
Organization = (item.child4 == null ? "" : item.child4 + "/") + Organization = (item.child4 == null ? "" : item.child4 + "\n") +
(item.child3 == null ? "" : item.child3 + "/") + (item.child3 == null ? "" : item.child3 + "\n") +
(item.child2 == null ? "" : item.child2 + "/") + (item.child2 == null ? "" : item.child2 + "\n") +
(item.child1 == null ? "" : item.child1 + "/") + (item.child1 == null ? "" : item.child1 + "\n") +
(item.root == null ? "" : item.root), (item.root == null ? "" : item.root),
root = item.root, root = item.root,

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

@ -449,10 +449,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 + "/" + placementAppointment.OrganizationOld; placementAppointment.OrganizationPositionOld = org.result.position + "/" + placementAppointment.OrganizationOld;
placementAppointment.AmountOld = org.result.salary; placementAppointment.AmountOld = org.result.salary;
@ -798,13 +798,13 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
p.child4Old != null 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.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.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.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.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, OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
@ -814,13 +814,13 @@ namespace BMA.EHR.Placement.Service.Controllers
LeaveDate = "-", LeaveDate = "-",
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" :
p.node == 4 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.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.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.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.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, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
@ -1013,13 +1013,13 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
p.child4Old != null 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.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.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.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.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, OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
@ -1029,13 +1029,13 @@ namespace BMA.EHR.Placement.Service.Controllers
LeaveDate = "-", LeaveDate = "-",
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" : NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" :
p.node == 4 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.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.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.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.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, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
@ -1230,13 +1230,13 @@ namespace BMA.EHR.Placement.Service.Controllers
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.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
p.child4Old != null 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.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.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.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.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(), OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld.ToThaiNumber(),
@ -1244,13 +1244,13 @@ namespace BMA.EHR.Placement.Service.Controllers
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.root == null ? p.position == null ? "-" : $"{p.position}/-" :
p.node == 4 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.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.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.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.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(), NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName.ToThaiNumber(),
@ -1433,13 +1433,13 @@ namespace BMA.EHR.Placement.Service.Controllers
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.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
p.child4Old != null 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.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.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.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.rootOld != null
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-", ? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-",
OldPositionNumber = p.posMasterNoOld == null ? "-" : OldPositionNumber = p.posMasterNoOld == null ? "-" :
@ -1451,13 +1451,13 @@ namespace BMA.EHR.Placement.Service.Controllers
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.root == null ? p.position == null ? "-" : $"{p.position}/-" :
p.node == 4 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.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.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.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.node == 0
? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-", ? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-",
NewPositionNumber = p.posMasterNo == null ? "-" : NewPositionNumber = p.posMasterNo == null ? "-" :
@ -1647,13 +1647,13 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" : OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
p.child4Old != null 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.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.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.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.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, OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
@ -1668,13 +1668,13 @@ namespace BMA.EHR.Placement.Service.Controllers
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.root == null ? p.position == null ? "-" : $"{p.position}/-" :
p.node == 4 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.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.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.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.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, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,

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

@ -481,10 +481,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 + "/" + placementAppointment.OrganizationOld; placementAppointment.OrganizationPositionOld = org.result.position + "/" + placementAppointment.OrganizationOld;
} }

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

@ -1576,18 +1576,18 @@ namespace BMA.EHR.Placement.Service.Controllers
$"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}", $"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
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.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" :
p.node == 4 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.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.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.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.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, 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 ? "-" :
@ -1603,15 +1603,15 @@ namespace BMA.EHR.Placement.Service.Controllers
PositionCandidate = p.PositionCandidate, //ตำแหน่งที่สอบแข่งขัน PositionCandidate = p.PositionCandidate, //ตำแหน่งที่สอบแข่งขัน
OcCandidate = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : OcCandidate = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" :
p.node == 4 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.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.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.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.node == 0
? p.positionName == null ? $"{p.root}" : $"{p.positionName}/{p.root}" : "-", ? p.positionName == null ? $"{p.root}" : $"{p.positionName} {p.root}" : "-",
RemarkHorizontal = r.RemarkHorizontal, RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical, RemarkVertical = r.RemarkVertical,
}).ToList(); }).ToList();
@ -1896,18 +1896,18 @@ namespace BMA.EHR.Placement.Service.Controllers
$"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}", $"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
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.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" :
p.node == 4 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.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.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.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.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, 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 ? "-" :
@ -2205,15 +2205,15 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PlacementEducations.FirstOrDefault().Degree, p.PlacementEducations.FirstOrDefault().Degree,
OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" :
p.nodeOld == "4" 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.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.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.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.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, 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 ? "-" :
@ -2226,15 +2226,15 @@ namespace BMA.EHR.Placement.Service.Controllers
OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld, OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld,
NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" :
p.node == 4 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.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.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.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.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, 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,
@ -2436,15 +2436,15 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PlacementEducations.FirstOrDefault().Degree, p.PlacementEducations.FirstOrDefault().Degree,
OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" :
p.nodeOld == "4" 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.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.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.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.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, 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,
@ -2457,15 +2457,15 @@ namespace BMA.EHR.Placement.Service.Controllers
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.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" :
p.node == 4 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.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.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.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.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, 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,
@ -2660,15 +2660,15 @@ namespace BMA.EHR.Placement.Service.Controllers
p.PlacementEducations.FirstOrDefault().Degree, p.PlacementEducations.FirstOrDefault().Degree,
OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" : OldOc = p.rootOld == null ? p.positionNameOld == null ? "-" : $"{p.positionNameOld}/-" :
p.nodeOld == "4" 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.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.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.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.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, 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 ? "-" :
@ -2681,15 +2681,15 @@ namespace BMA.EHR.Placement.Service.Controllers
LeaveDate = "-", LeaveDate = "-",
NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" : NewOc = p.root == null ? p.positionName == null ? "-" : $"{p.positionName}/-" :
p.node == 4 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.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.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.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.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, 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 ? "-" :

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

@ -395,10 +395,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 + "/" + placementOfficer.OrganizationOld; placementOfficer.OrganizationPositionOld = org.result.position + "/" + placementOfficer.OrganizationOld;
} }
@ -605,13 +605,13 @@ namespace BMA.EHR.Placement.Service.Controllers
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.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null 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.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.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.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.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, Organization = p.Organization == null ? "" : p.Organization,

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

@ -495,10 +495,10 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.PositionLevelOld = org.result.posLevelName; placementReceive.PositionLevelOld = org.result.posLevelName;
placementReceive.PositionTypeOld = org.result.posTypeName; placementReceive.PositionTypeOld = org.result.posTypeName;
placementReceive.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; placementReceive.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementReceive.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") + placementReceive.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);
placementReceive.OrganizationPositionOld = org.result.position + "/" + placementReceive.OrganizationOld; placementReceive.OrganizationPositionOld = org.result.position + "/" + placementReceive.OrganizationOld;
} }
@ -930,13 +930,13 @@ namespace BMA.EHR.Placement.Service.Controllers
OldOrg = p.OrganizationPositionOld ?? "-", OldOrg = p.OrganizationPositionOld ?? "-",
OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null 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.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.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.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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-",
OldPositionType = p.PositionTypeOld ?? "-", OldPositionType = p.PositionTypeOld ?? "-",
@ -944,13 +944,13 @@ namespace BMA.EHR.Placement.Service.Controllers
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.root == null ? p.position == null ? "-" : $"{p.position}/-" :
p.node == 4 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.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.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.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.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, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,

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

@ -273,10 +273,10 @@ namespace BMA.EHR.Placement.Service.Controllers
placementRepatriation.PositionLevelOld = org.result.posLevelName; placementRepatriation.PositionLevelOld = org.result.posLevelName;
placementRepatriation.PositionTypeOld = org.result.posTypeName; placementRepatriation.PositionTypeOld = org.result.posTypeName;
placementRepatriation.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; placementRepatriation.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementRepatriation.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") + placementRepatriation.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);
placementRepatriation.OrganizationPositionOld = org.result.position + "/" + placementRepatriation.OrganizationOld; placementRepatriation.OrganizationPositionOld = org.result.position + "/" + placementRepatriation.OrganizationOld;
} }

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

@ -524,10 +524,10 @@ namespace BMA.EHR.Placement.Service.Controllers
placementTransfer.PositionLevelOld = org.result.posLevelName; placementTransfer.PositionLevelOld = org.result.posLevelName;
placementTransfer.PositionTypeOld = org.result.posTypeName; placementTransfer.PositionTypeOld = org.result.posTypeName;
placementTransfer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo; placementTransfer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementTransfer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") + placementTransfer.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);
placementTransfer.OrganizationPositionOld = org.result.position + "/" + placementTransfer.OrganizationOld; placementTransfer.OrganizationPositionOld = org.result.position + "/" + placementTransfer.OrganizationOld;
} }
@ -811,13 +811,13 @@ namespace BMA.EHR.Placement.Service.Controllers
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.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null 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.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.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.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.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, PositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,

8
BMA.EHR.Report.Service/Controllers/RetireReportController.cs
View file

@ -133,10 +133,10 @@ namespace BMA.EHR.Report.Service.Controllers
// thaiOrder = $"ลำดับที่ {thaiOrder.ToThaiNumber()}"; // thaiOrder = $"ลำดับที่ {thaiOrder.ToThaiNumber()}";
// string thaiPosNo = profile.GetType().GetProperty("posNo").GetValue(profile); // string thaiPosNo = profile.GetType().GetProperty("posNo").GetValue(profile);
// thaiPosNo = thaiPosNo != null ? $"(ตำแหน่งเลขที่ {thaiPosNo.ToThaiNumber()})" : $"(ตำแหน่งเลขที่ - )"; // thaiPosNo = thaiPosNo != null ? $"(ตำแหน่งเลขที่ {thaiPosNo.ToThaiNumber()})" : $"(ตำแหน่งเลขที่ - )";
// string organizationOrganization = (profile.GetType().GetProperty("child4").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child4").GetValue(profile) + "/") + // string organizationOrganization = (profile.GetType().GetProperty("child4").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child4").GetValue(profile) + "\n") +
// (profile.GetType().GetProperty("child3").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child3").GetValue(profile) + "/") + // (profile.GetType().GetProperty("child3").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child3").GetValue(profile) + "\n") +
// (profile.GetType().GetProperty("child2").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child2").GetValue(profile) + "/") + // (profile.GetType().GetProperty("child2").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child2").GetValue(profile) + "\n") +
// (profile.GetType().GetProperty("child1").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child1").GetValue(profile) + "/") + // (profile.GetType().GetProperty("child1").GetValue(profile) == null ? "" : profile.GetType().GetProperty("child1").GetValue(profile) + "\n") +
// (profile.GetType().GetProperty("root").GetValue(profile) == null ? "" : profile.GetType().GetProperty("root").GetValue(profile)); // (profile.GetType().GetProperty("root").GetValue(profile) == null ? "" : profile.GetType().GetProperty("root").GetValue(profile));
// string reason = profile.GetType().GetProperty("reason").GetValue(profile); // string reason = profile.GetType().GetProperty("reason").GetValue(profile);
// organizationOrganization = organizationOrganization != string.Empty ? organizationOrganization : reason != string.Empty ? reason : string.Empty ; // organizationOrganization = organizationOrganization != string.Empty ? organizationOrganization : reason != string.Empty ? reason : string.Empty ;

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

@ -590,10 +590,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);
} }
@ -619,10 +619,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);
} }

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

@ -396,10 +396,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 + "/" + retirementOther.OrganizationOld; retirementOther.OrganizationPositionOld = org.result.position + "/" + retirementOther.OrganizationOld;
retirementOther.EducationOld = org.result.education; retirementOther.EducationOld = org.result.education;
@ -888,13 +888,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
Education = p.EducationOld == null ? "-" : p.EducationOld, Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null 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.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.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.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.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, OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
@ -905,13 +905,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
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.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null 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.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.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.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.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, NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,

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

@ -316,10 +316,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 + "/" + retirementOut.OrganizationOld; retirementOut.OrganizationPositionOld = org.result.position + "/" + retirementOut.OrganizationOld;
retirementOut.AmountOld = org.result.salary; retirementOut.AmountOld = org.result.salary;
@ -371,10 +371,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 + "/" + retirementOut.OrganizationOld; retirementOut.OrganizationPositionOld = org.result.position + "/" + retirementOut.OrganizationOld;
retirementOut.AmountOld = org.result.salary; retirementOut.AmountOld = org.result.salary;

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

@ -100,7 +100,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// var ret = String.Empty; // var ret = String.Empty;
// foreach (var oc in ocList) // foreach (var oc in ocList)
// { // {
// ret = oc + "/" + ret; // ret = oc + "\n" + ret;
// } // }
// if (ret.Length > 2) // if (ret.Length > 2)
@ -952,10 +952,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 + "/" + retirementResign.OrganizationOld; retirementResign.OrganizationPositionOld = org.result.position + "/" + retirementResign.OrganizationOld;
} }
@ -2558,13 +2558,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
Organization = p.OrganizationPositionOld ?? "-", Organization = p.OrganizationPositionOld ?? "-",
Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null 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.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.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.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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-",
PositionLevel = p.PositionLevelOld ?? "-", PositionLevel = p.PositionLevelOld ?? "-",

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

@ -894,10 +894,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 + "/" + retirementResignEmployee.OrganizationOld; retirementResignEmployee.OrganizationPositionOld = org.result.position + "/" + retirementResignEmployee.OrganizationOld;
} }
@ -2500,13 +2500,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
Organization = p.OrganizationPositionOld ?? "-", Organization = p.OrganizationPositionOld ?? "-",
Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" : Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null 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.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.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.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.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-", ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-",
PositionLevel = p.PositionLevelOld ?? "-", PositionLevel = p.PositionLevelOld ?? "-",