This commit is contained in:
kittapath
parent
50b3dde54e
commit
92e6d1ebfc
14 changed files with 181 additions and 181 deletions
|
|
@ -449,10 +449,10 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementAppointment.PositionLevelOld = org.result.posLevelName;
|
||||
placementAppointment.PositionTypeOld = org.result.posTypeName;
|
||||
placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
|
||||
placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
|
||||
(org.result.child3 == null ? "" : org.result.child3 + "/") +
|
||||
(org.result.child2 == null ? "" : org.result.child2 + "/") +
|
||||
(org.result.child1 == null ? "" : org.result.child1 + "/") +
|
||||
placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
|
||||
(org.result.child3 == null ? "" : org.result.child3 + "\n") +
|
||||
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
|
||||
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
|
||||
(org.result.root == null ? "" : org.result.root);
|
||||
placementAppointment.OrganizationPositionOld = org.result.position + "/" + placementAppointment.OrganizationOld;
|
||||
placementAppointment.AmountOld = org.result.salary;
|
||||
|
|
@ -798,13 +798,13 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Education = p.EducationOld == null ? "-" : p.EducationOld,
|
||||
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
|
||||
p.child4Old != null
|
||||
? p.positionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child3Old != null
|
||||
? p.positionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child2Old != null
|
||||
? p.positionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child1Old != null
|
||||
? p.positionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child1Old} {p.rootOld}" :
|
||||
p.rootOld != null
|
||||
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-",
|
||||
OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
|
||||
|
|
@ -814,13 +814,13 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
LeaveDate = "-",
|
||||
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" :
|
||||
p.node == 4
|
||||
? p.position == null ? $"{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 3
|
||||
? p.position == null ? $"{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 2
|
||||
? p.position == null ? $"{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child2} {p.child1} {p.root}" :
|
||||
p.node == 1
|
||||
? p.position == null ? $"{p.child1}/{p.root}" : $"{p.position}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child1} {p.root}" : $"{p.position}/{p.child1} {p.root}" :
|
||||
p.node == 0
|
||||
? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-",
|
||||
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
|
||||
|
|
@ -1013,13 +1013,13 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Education = p.EducationOld == null ? "-" : p.EducationOld,
|
||||
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
|
||||
p.child4Old != null
|
||||
? p.positionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child3Old != null
|
||||
? p.positionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child2Old != null
|
||||
? p.positionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child1Old != null
|
||||
? p.positionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child1Old} {p.rootOld}" :
|
||||
p.rootOld != null
|
||||
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-",
|
||||
OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
|
||||
|
|
@ -1029,13 +1029,13 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
LeaveDate = "-",
|
||||
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" :
|
||||
p.node == 4
|
||||
? p.position == null ? $"{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 3
|
||||
? p.position == null ? $"{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 2
|
||||
? p.position == null ? $"{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child2} {p.child1} {p.root}" :
|
||||
p.node == 1
|
||||
? p.position == null ? $"{p.child1}/{p.root}" : $"{p.position}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child1} {p.root}" : $"{p.position}/{p.child1} {p.root}" :
|
||||
p.node == 0
|
||||
? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-",
|
||||
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
|
||||
|
|
@ -1230,13 +1230,13 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
OldOrganization = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
|
||||
p.child4Old != null
|
||||
? p.positionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child3Old != null
|
||||
? p.positionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child2Old != null
|
||||
? p.positionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child1Old != null
|
||||
? p.positionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child1Old} {p.rootOld}" :
|
||||
p.rootOld != null
|
||||
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-",
|
||||
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(),
|
||||
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" :
|
||||
p.node == 4
|
||||
? p.position == null ? $"{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 3
|
||||
? p.position == null ? $"{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 2
|
||||
? p.position == null ? $"{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child2} {p.child1} {p.root}" :
|
||||
p.node == 1
|
||||
? p.position == null ? $"{p.child1}/{p.root}" : $"{p.position}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child1} {p.root}" : $"{p.position}/{p.child1} {p.root}" :
|
||||
p.node == 0
|
||||
? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-",
|
||||
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName.ToThaiNumber(),
|
||||
|
|
@ -1433,13 +1433,13 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
|
||||
p.child4Old != null
|
||||
? p.positionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child3Old != null
|
||||
? p.positionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child2Old != null
|
||||
? p.positionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child1Old != null
|
||||
? p.positionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child1Old} {p.rootOld}" :
|
||||
p.rootOld != null
|
||||
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-",
|
||||
OldPositionNumber = p.posMasterNoOld == null ? "-" :
|
||||
|
|
@ -1451,13 +1451,13 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" :
|
||||
p.node == 4
|
||||
? p.position == null ? $"{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 3
|
||||
? p.position == null ? $"{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 2
|
||||
? p.position == null ? $"{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child2} {p.child1} {p.root}" :
|
||||
p.node == 1
|
||||
? p.position == null ? $"{p.child1}/{p.root}" : $"{p.position}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child1} {p.root}" : $"{p.position}/{p.child1} {p.root}" :
|
||||
p.node == 0
|
||||
? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-",
|
||||
NewPositionNumber = p.posMasterNo == null ? "-" :
|
||||
|
|
@ -1647,13 +1647,13 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Education = p.EducationOld == null ? "-" : p.EducationOld,
|
||||
OldOc = p.rootOld == null ? p.positionOld == null ? "-" : $"{p.positionOld}/-" :
|
||||
p.child4Old != null
|
||||
? p.positionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child3Old != null
|
||||
? p.positionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child2Old != null
|
||||
? p.positionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child1Old != null
|
||||
? p.positionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.positionOld}/{p.child1Old}/{p.rootOld}" :
|
||||
? p.positionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.positionOld}/{p.child1Old} {p.rootOld}" :
|
||||
p.rootOld != null
|
||||
? p.positionOld == null ? $"{p.rootOld}" : $"{p.positionOld}/{p.rootOld}" : "-",
|
||||
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(),
|
||||
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" :
|
||||
p.node == 4
|
||||
? p.position == null ? $"{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child4}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 3
|
||||
? p.position == null ? $"{p.child3}/{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child3}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 2
|
||||
? p.position == null ? $"{p.child2}/{p.child1}/{p.root}" : $"{p.position}/{p.child2}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position}/{p.child2} {p.child1} {p.root}" :
|
||||
p.node == 1
|
||||
? p.position == null ? $"{p.child1}/{p.root}" : $"{p.position}/{p.child1}/{p.root}" :
|
||||
? p.position == null ? $"{p.child1} {p.root}" : $"{p.position}/{p.child1} {p.root}" :
|
||||
p.node == 0
|
||||
? p.position == null ? $"{p.root}" : $"{p.position}/{p.root}" : "-",
|
||||
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue