Merge branch 'develop' into adiDev

This commit is contained in:
Adisak 2026-05-25 17:20:46 +07:00
commit aeb2ceea6f
13 changed files with 332 additions and 64 deletions

View file

@ -676,6 +676,7 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName;
uppdated.PositionExecutive = req.posExecutiveName;
uppdated.posExecutiveId = req.posExecutiveId;
uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea;
uppdated.positionField = req.positionField;
@ -1014,6 +1015,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,
positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId,
orgRoot = p.root,
orgChild1 = p.child1,
@ -1226,6 +1229,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,
positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId,
orgRoot = p.root,
orgChild1 = p.child1,
@ -1855,6 +1860,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,
positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId,
orgRoot = p.root,
orgChild1 = p.child1,
@ -2016,6 +2023,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionLevel = p.posLevelName,
posmasterId = p.posmasterId,
positionId = p.positionId,
posExecutiveId = p.posExecutiveId,
positionField = p.positionField,
commandId = r.commandId,
orgRoot = p.root,
orgChild1 = p.child1,