diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index ea26afc1..4bb790bb 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -799,6 +799,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -891,6 +892,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -1041,6 +1043,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -1149,6 +1152,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -1256,6 +1260,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -1363,6 +1368,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -1470,6 +1476,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -1577,6 +1584,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -1684,6 +1692,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, @@ -1807,6 +1816,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers select new { profileId = p.PersonId, + commandId = r.commandId, date = r.commandAffectDate, refCommandNo = $"{r.commandNo}/{r.commandYear}", salaryRef = r.templateDoc, diff --git a/BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs b/BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs index c7446828..2c685ac6 100644 --- a/BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs +++ b/BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs @@ -12,6 +12,7 @@ namespace BMA.EHR.Discipline.Service.Requests public string? refId { get; set; } public DateTime commandAffectDate { get; set; } public string? commandNo { get; set; } + public string? commandId { get; set; } public int commandYear { get; set; } public string? templateDoc { get; set; } public double? amount { get; set; } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 7baa1a68..050451c6 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -863,6 +863,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : @@ -1021,6 +1022,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : @@ -1177,6 +1179,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : @@ -1328,6 +1331,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : @@ -1490,6 +1494,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 6457e637..f7f13b48 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1943,6 +1943,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = string.Empty, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : @@ -2127,6 +2128,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : @@ -2298,6 +2300,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : @@ -2463,6 +2466,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 0f574e63..eeadf79b 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -676,6 +676,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 41a430d5..fed60e5a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -1039,6 +1039,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = string.Empty, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index 03395573..ee93b63d 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -537,6 +537,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 987f11e2..02ad4396 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -882,6 +882,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index adf37b76..3f06697a 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -740,6 +740,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, @@ -891,6 +892,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index 887cc1f3..bf508074 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -528,6 +528,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 8e53676e..5683c521 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -1762,6 +1762,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, @@ -1859,6 +1860,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, @@ -2001,6 +2003,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.PositionNumberOld, diff --git a/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs b/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs index c9d87113..34e0e4f6 100644 --- a/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs +++ b/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs @@ -12,6 +12,7 @@ namespace BMA.EHR.Retirement.Service.Requests public string? refId { get; set; } public DateTime commandAffectDate { get; set; } public string? commandNo { get; set; } + public string? commandId { get; set; } public int commandYear { get; set; } public string? templateDoc { get; set; } public double? amount { get; set; }