diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index ff010a2a..755b7440 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -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, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 39b7fc63..2a413aea 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1065,6 +1065,7 @@ namespace BMA.EHR.Placement.Service.Controllers person.positionId = req.positionId; person.posMasterNo = req.posMasterNo; person.positionName = req.positionName; + person.posExecutiveId = req.posExecutiveId; person.PositionExecutive = req.posExecutiveName; person.positionExecutiveField = req.positionExecutiveField; person.positionArea = req.positionArea; @@ -1453,6 +1454,10 @@ namespace BMA.EHR.Placement.Service.Controllers profile.posTypeName = null; profile.posLevelId = null; profile.posLevelName = null; + profile.PositionExecutive = null; + profile.posExecutiveId = null; + profile.positionArea = null; + profile.positionExecutiveField = null; // profile.PositionLevel = null; // profile.PositionType = null; @@ -1936,7 +1941,14 @@ namespace BMA.EHR.Placement.Service.Controllers bodyPosition = new { posmasterId = p.posmasterId, - positionId = p.positionId + positionId = p.positionId, + positionName = p.positionName, + positionField = p.positionField, + posTypeId = p.posTypeId, + posLevelId = p.posLevelId, + posExecutiveId = p.posExecutiveId, + positionExecutiveField = p.positionExecutiveField, + positionArea = p.positionArea, }, bodyMarry = new { @@ -2292,7 +2304,14 @@ namespace BMA.EHR.Placement.Service.Controllers bodyPosition = new { posmasterId = p.posmasterId, - positionId = p.positionId + positionId = p.positionId, + positionName = p.positionName, + positionField = p.positionField, + posTypeId = p.posTypeId, + posLevelId = p.posLevelId, + posExecutiveId = p.posExecutiveId, + positionExecutiveField = p.positionExecutiveField, + positionArea = p.positionArea, }, bodyMarry = new { @@ -2563,6 +2582,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, @@ -2804,6 +2825,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, @@ -3030,6 +3053,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, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 68634c78..d51f1836 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -782,6 +782,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; @@ -1216,8 +1217,15 @@ namespace BMA.EHR.Placement.Service.Controllers }, bodyPosition = new { - posmasterId = p.posmasterId, - positionId = p.positionId + posmasterId = p.posmasterId, + positionId = p.positionId, + positionName = p.position, + positionField = p.positionField, + posTypeId = p.posTypeId, + posLevelId = p.posLevelId, + posExecutiveId = p.posExecutiveId, + positionExecutiveField = p.positionExecutiveField, + positionArea = p.positionArea, } }).ToList(); diff --git a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs index 8f6c31ba..e64444ed 100644 --- a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs +++ b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs @@ -30,6 +30,7 @@ namespace BMA.EHR.Placement.Service.Requests public string? posLevelName { get; set; } public string? typeCommand { get; set; } public string? posExecutiveName { get; set; } + public string? posExecutiveId { get; set; } public string? positionExecutiveField { get; set; } public string? positionArea { get; set; } } diff --git a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs index 9b22874b..29e5d096 100644 --- a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs +++ b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs @@ -30,6 +30,7 @@ namespace BMA.EHR.Placement.Service.Requests public string? posLevelName { get; set; } public string? typeCommand { get; set; } public string? posExecutiveName { get; set; } + public string? posExecutiveId { get; set; } public string? positionExecutiveField { get; set; } public string? positionArea { get; set; } } diff --git a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs index 66042358..681bc1d5 100644 --- a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs +++ b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs @@ -39,6 +39,7 @@ namespace BMA.EHR.Placement.Service.Requests public string? posLevelName { get; set; } public string? typeCommand { get; set; } public string? posExecutiveName { get; set; } + public string? posExecutiveId { get; set; } public string? positionExecutiveField { get; set; } public string? positionArea { get; set; } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 588ccabe..36fbaa75 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -569,6 +569,7 @@ namespace BMA.EHR.Retirement.Service.Controllers uppdated.positionId = req.positionId; uppdated.posMasterNo = req.posMasterNo; uppdated.position = req.positionName; + uppdated.posExecutiveId = req.posExecutiveId; uppdated.PositionExecutive = req.posExecutiveName; uppdated.positionExecutiveField = req.positionExecutiveField; uppdated.positionArea = req.positionArea; @@ -889,6 +890,8 @@ namespace BMA.EHR.Retirement.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + posExecutiveId = p.posExecutiveId, + positionField = p.positionField, positionTypeNew = p.posTypeId, positionLevelNew = p.posLevelId, positionNameNew = p.position, @@ -1138,6 +1141,8 @@ namespace BMA.EHR.Retirement.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + posExecutiveId = p.posExecutiveId, + positionField = p.positionField, positionTypeNew = p.posTypeId, positionLevelNew = p.posLevelId, positionNameNew = p.position, diff --git a/BMA.EHR.Retirement.Service/Requests/PersonSelectPositionOtherRequest.cs b/BMA.EHR.Retirement.Service/Requests/PersonSelectPositionOtherRequest.cs index 8252d1af..44c2da54 100644 --- a/BMA.EHR.Retirement.Service/Requests/PersonSelectPositionOtherRequest.cs +++ b/BMA.EHR.Retirement.Service/Requests/PersonSelectPositionOtherRequest.cs @@ -29,6 +29,7 @@ namespace BMA.EHR.Retirement.Service.Requests public string? posLevelId { get; set; } public string? posLevelName { get; set; } public string? typeCommand { get; set; } + public string? posExecutiveId { get; set; } public string? posExecutiveName { get; set; } public string? positionExecutiveField { get; set; } public string? positionArea { get; set; }