This commit is contained in:
parent
78bbfb7107
commit
ff4019978f
14 changed files with 178 additions and 178 deletions
|
|
@ -316,12 +316,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementOut.PositionLevelOld = org.result.posLevelName;
|
||||
retirementOut.PositionTypeOld = org.result.posTypeName;
|
||||
retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
|
||||
retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\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") +
|
||||
retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") +
|
||||
(org.result.child3 == null ? "" : org.result.child3 + " ") +
|
||||
(org.result.child2 == null ? "" : org.result.child2 + " ") +
|
||||
(org.result.child1 == null ? "" : org.result.child1 + " ") +
|
||||
(org.result.root == null ? "" : org.result.root);
|
||||
retirementOut.OrganizationPositionOld = org.result.position + "/" + retirementOut.OrganizationOld;
|
||||
retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld;
|
||||
retirementOut.AmountOld = org.result.salary;
|
||||
}
|
||||
}
|
||||
|
|
@ -371,12 +371,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementOut.PositionLevelOld = org.result.posLevelName;
|
||||
retirementOut.PositionTypeOld = org.result.posTypeName;
|
||||
retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
|
||||
retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\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") +
|
||||
retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") +
|
||||
(org.result.child3 == null ? "" : org.result.child3 + " ") +
|
||||
(org.result.child2 == null ? "" : org.result.child2 + " ") +
|
||||
(org.result.child1 == null ? "" : org.result.child1 + " ") +
|
||||
(org.result.root == null ? "" : org.result.root);
|
||||
retirementOut.OrganizationPositionOld = org.result.position + "/" + retirementOut.OrganizationOld;
|
||||
retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld;
|
||||
retirementOut.AmountOld = org.result.salary;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue