Compare commits

..

No commits in common. "04ac35c10bd57d0fe0edd2d2b7c20e3426b56da5" and "8415ffc92db0804ba0ab3336e35bd14477283082" have entirely different histories.

8 changed files with 4 additions and 55 deletions

View file

@ -676,7 +676,6 @@ 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;
@ -1015,8 +1014,6 @@ 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,
@ -1229,8 +1226,6 @@ 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,
@ -1860,8 +1855,6 @@ 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,
@ -2023,8 +2016,6 @@ 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,

View file

@ -1065,7 +1065,6 @@ 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;
@ -1454,10 +1453,6 @@ 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;
@ -1941,14 +1936,7 @@ namespace BMA.EHR.Placement.Service.Controllers
bodyPosition = new
{
posmasterId = p.posmasterId,
positionId = p.positionId,
positionName = p.positionName,
positionField = p.positionField,
posTypeId = p.posTypeId,
posLevelId = p.posLevelId,
posExecutiveId = p.posExecutiveId,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionId = p.positionId
},
bodyMarry = new
{
@ -2304,14 +2292,7 @@ namespace BMA.EHR.Placement.Service.Controllers
bodyPosition = new
{
posmasterId = p.posmasterId,
positionId = p.positionId,
positionName = p.positionName,
positionField = p.positionField,
posTypeId = p.posTypeId,
posLevelId = p.posLevelId,
posExecutiveId = p.posExecutiveId,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionId = p.positionId
},
bodyMarry = new
{
@ -2582,8 +2563,6 @@ 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,
@ -2825,8 +2804,6 @@ 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,
@ -3053,8 +3030,6 @@ 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,

View file

@ -782,7 +782,6 @@ 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;
@ -1217,15 +1216,8 @@ namespace BMA.EHR.Placement.Service.Controllers
},
bodyPosition = new
{
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,
posmasterId = p.posmasterId,
positionId = p.positionId
}
}).ToList();

View file

@ -30,7 +30,6 @@ 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; }
}

View file

@ -30,7 +30,6 @@ 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; }
}

View file

@ -39,7 +39,6 @@ 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; }

View file

@ -569,7 +569,6 @@ 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;
@ -890,8 +889,6 @@ 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,
@ -1141,8 +1138,6 @@ 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,

View file

@ -29,7 +29,6 @@ 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; }