From 03a6d208bec0c52ae48d5587b19c868ac1e1611c Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 22 Oct 2024 10:49:11 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20=E0=B9=80?= =?UTF-8?q?=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=9A=E0=B8=B1=E0=B8=99?= =?UTF-8?q?=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=A5=E0=B8=87=E0=B8=97=E0=B8=B0?= =?UTF-8?q?=E0=B9=80=E0=B8=97=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DisciplineResultController.cs | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 2ca5556b..570a0c30 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -814,6 +814,9 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, unStigma = "คำสั่งลงโทษ ปลดออกจากราชการ", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -907,6 +910,9 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, unStigma = "คำสั่งลงโทษ ไล่ออกจากราชการ", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1058,6 +1064,9 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, unStigma = "คำสั่งลงโทษ พักจากราชการ", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1167,6 +1176,9 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, unStigma = "คำสั่งลงโทษ ให้ออกจากราชการไว้ก่อน", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1275,6 +1287,9 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, unStigma = "คำสั่งลงโทษ ลงโทษ ภาคทัณฑ์", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1382,7 +1397,10 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers refCommandDate = DateTime.Now, detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, - unStigma = "คำสั่งลงโทษ ตัดเงินเดือน" + unStigma = "คำสั่งลงโทษ ตัดเงินเดือน", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1490,7 +1508,10 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers refCommandDate = DateTime.Now, detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, - unStigma = "คำสั่งลงโทษ ลดขั้นเงินเดือน" + unStigma = "คำสั่งลงโทษ ลดขั้นเงินเดือน", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1598,7 +1619,10 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers refCommandDate = DateTime.Now, detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, - unStigma = "คำสั่งเพิ่มโทษ" + unStigma = "คำสั่งเพิ่มโทษ", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1706,7 +1730,10 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers refCommandDate = DateTime.Now, detail = p.DisciplineDisciplinary.Title, level = p.DisciplineDisciplinary.DisciplinaryFaultLevel, - unStigma = "คำสั่งงดโทษ" + unStigma = "คำสั่งงดโทษ", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1830,7 +1857,10 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers refCommandDate = DateTime.Now, detail = p.DisciplineInvestigate.Title, level = "", - unStigma = "คำสั่งยุติเรื่อง" + unStigma = "คำสั่งยุติเรื่อง", + amount = r.amount, + positionSalaryAmount = r.positionSalaryAmount, + mouthSalaryAmount = r.mouthSalaryAmount, }).ToList(); var baseAPIOrg = _configuration["API"]; var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-leave-discipline";