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

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.PositionTypeOld = org.result.posTypeName;
placementReceive.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementReceive.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(org.result.child3 == null ? "" : org.result.child3 + "/") +
(org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") +
placementReceive.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\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);
placementReceive.OrganizationPositionOld = org.result.position + "/" + placementReceive.OrganizationOld;
}
@ -930,13 +930,13 @@ namespace BMA.EHR.Placement.Service.Controllers
OldOrg = p.OrganizationPositionOld ?? "-",
OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
p.child4Old != null
? p.PositionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld}/{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
p.child3Old != null
? p.PositionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld}/{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
p.child2Old != null
? p.PositionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld}/{p.child2Old} {p.child1Old} {p.rootOld}" :
p.child1Old != null
? p.PositionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child1Old}/{p.rootOld}" :
? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld}/{p.child1Old} {p.rootOld}" :
p.rootOld != null
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-",
OldPositionType = p.PositionTypeOld ?? "-",
@ -944,13 +944,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}" : "-",
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,