add salary special

BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs

@@ -468,7 +468,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
             foreach (var data in data1)
             {
                 data2.Add(data);
-            };
+            }
+            ;
             return Success(data2);
         }
 
@@ -820,6 +821,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งลงโทษ ปลดออกจากราชการ",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   isGovernment = false,
@@ -920,6 +922,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งลงโทษ ไล่ออกจากราชการ",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   isGovernment = false,
@@ -1098,6 +1101,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งลงโทษ พักจากราชการ",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   isGovernment = false,
@@ -1214,6 +1218,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งลงโทษ ให้ออกจากราชการไว้ก่อน",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   isGovernment = false,
@@ -1329,6 +1334,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งลงโทษ ลงโทษ ภาคทัณฑ์",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   profileType = p.profileType,
@@ -1443,6 +1449,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งลงโทษ ตัดเงินเดือน",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   profileType = p.profileType,
@@ -1557,6 +1564,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งลงโทษ ลดขั้นเงินเดือน",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   profileType = p.profileType,
@@ -1671,6 +1679,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งเพิ่มโทษ",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   profileType = p.profileType,
@@ -1785,6 +1794,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = p.DisciplineDisciplinary.DisciplinaryFaultLevel,
                                   unStigma = "คำสั่งงดโทษ",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   profileType = p.profileType,
@@ -1915,6 +1925,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   level = "",
                                   unStigma = "คำสั่งยุติเรื่อง",
                                   amount = r.amount,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   profileType = p.profileType,

BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs

@@ -16,6 +16,7 @@ namespace BMA.EHR.Discipline.Service.Requests
         public int commandYear { get; set; }
         public string? templateDoc { get; set; }
         public double? amount { get; set; }
+        public double? amountSpecial { get; set; }
         public double? positionSalaryAmount { get; set; }
         public double? mouthSalaryAmount { get; set; }
         public string? refCommandCode { get; set; }

BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs

@@ -675,6 +675,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                   date = r.commandAffectDate,
                                   amount = r.amount,
                                   commandId = r.commandId,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   posNo = p.PositionNumberOld,

BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs

@@ -500,6 +500,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                   date = r.commandAffectDate,
                                   amount = r.amount,
                                   commandId = r.commandId,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   posNo = p.PositionNumberOld,

BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs

@@ -574,6 +574,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   date = r.commandAffectDate,
                                   amount = r.amount,
                                   commandId = r.commandId,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   posNo = p.PositionNumberOld,

BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs

@@ -2447,6 +2447,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   date = r.commandAffectDate,
                                   amount = r.amount,
                                   commandId = r.commandId,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   posNo = p.PositionNumberOld,
@@ -2635,6 +2636,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   date = r.commandAffectDate,
                                   amount = r.amount,
                                   commandId = r.commandId,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   posNo = p.PositionNumberOld,

BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs

@@ -2389,6 +2389,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   date = r.commandAffectDate,
                                   amount = r.amount,
                                   commandId = r.commandId,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   posNo = p.PositionNumberOld,
@@ -2577,6 +2578,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   date = r.commandAffectDate,
                                   amount = r.amount,
                                   commandId = r.commandId,
+                                  amountSpecial = r.amountSpecial,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
                                   posNo = p.PositionNumberOld,