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

Merge branch 'develop' into develop-Bright
All checks were successful
Build & Deploy Placement Service / build (push) Successful in 1m51s
Details
Build & Deploy Retirement Service / build (push) Successful in 1m55s
Details

Browse source
This commit is contained in:
harid 2026-05-21 16:47:57 +07:00
commit 04ac35c10b
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -590,7 +590,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.positionAreaOld = org.result.positionArea; placementReceive.positionAreaOld = org.result.positionArea;
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.posNo;
placementReceive.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + placementReceive.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + "\n") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + "\n") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +

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

@ -764,7 +764,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementTransfer.positionAreaOld = org.result.positionArea; placementTransfer.positionAreaOld = org.result.positionArea;
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.posNo;
placementTransfer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") + placementTransfer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
(org.result.child3 == null ? "" : org.result.child3 + "\n") + (org.result.child3 == null ? "" : org.result.child3 + "\n") +
(org.result.child2 == null ? "" : org.result.child2 + "\n") + (org.result.child2 == null ? "" : org.result.child2 + "\n") +

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

@ -53,6 +53,7 @@ namespace BMA.EHR.Placement.Service.Requests
public double? Amount { get; set; } public double? Amount { get; set; }
public string? avatarUrl { get; set; } public string? avatarUrl { get; set; }
public bool? isDeputy { get; set; } public bool? isDeputy { get; set; }
public string? posNo { get; set; }
} }
} }