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

fix #2571
All checks were successful
Build & Deploy Retirement Service / build (push) Successful in 1m58s
Details

Browse source
This commit is contained in:
harid 2026-06-22 13:21:33 +07:00
parent be1f6dd84e
commit baf828ac85
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -449,11 +449,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName;
retirementOther.PositionNumberOld = org.result.posNo;
retirementOther.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);
retirementOther.OrganizationOld = org.result.org ?? "";
retirementOther.OrganizationPositionOld = org.result.position + "\n" +
(retirementOther.PositionExecutiveOld == null ? "" : (retirementOther.positionExecutiveField == null ? retirementOther.PositionExecutiveOld + "\n" : retirementOther.PositionExecutiveOld + "(" + retirementOther.positionExecutiveField + ")" + "\n"))
+ retirementOther.OrganizationOld;

1
BMA.EHR.Retirement.Service/Requests/OrgRequest.cs
View file

@ -54,5 +54,6 @@ namespace BMA.EHR.Retirement.Service.Requests
public DateTime? leaveDate { get; set; }
public string? education { get; set; }
public double? salary { get; set; }
public string? org { get; set; }
}
}