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";