From cea266afdb73bee15e823f49e3911799ebb2b346 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 21 Oct 2024 14:23:42 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20id=20=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= =?UTF-8?q?=E0=B8=A5=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=88=E0=B8=87=20#665?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DisciplineResultController.cs | 10 ++++++++++ .../Requests/ReportExecuteRequest.cs | 1 + .../Controllers/PlacementAppointmentController.cs | 5 +++++ .../Controllers/PlacementController.cs | 4 ++++ .../Controllers/PlacementOfficerController.cs | 1 + .../Controllers/PlacementReceiveController.cs | 1 + .../Controllers/PlacementRepatriationController.cs | 1 + .../Controllers/PlacementTransferController.cs | 1 + .../Controllers/RetirementOtherController.cs | 2 ++ .../Controllers/RetirementOutController.cs | 1 + .../Controllers/RetirementResignController.cs | 3 +++ .../Requests/ReportExecuteRequest.cs | 1 + 12 files changed, 31 insertions(+) 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 23950d75..3faa24d0 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -862,6 +862,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 ? "" : @@ -1020,6 +1021,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 ? "" : @@ -1176,6 +1178,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 ? "" : @@ -1327,6 +1330,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 ? "" : @@ -1489,6 +1493,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 ba0006d6..e1122ce6 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1934,6 +1934,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 ? "" : @@ -2118,6 +2119,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 ? "" : @@ -2289,6 +2291,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 ? "" : @@ -2454,6 +2457,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 02dfe7d6..eaf72e83 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -675,6 +675,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 a912f42a..57e98ab1 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -1038,6 +1038,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 ff68ddb1..1ea65f06 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -536,6 +536,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 fa164e3f..73fe99bc 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -881,6 +881,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 e513cfc5..59efef0f 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -1763,6 +1763,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, @@ -1860,6 +1861,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, @@ -2002,6 +2004,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; }