From a4d2e5dc15ec75265e6e6441b396c19b947b69dd Mon Sep 17 00:00:00 2001 From: moss <> Date: Tue, 8 Apr 2025 18:01:31 +0700 Subject: [PATCH] salary-leave-discipline --- .../Controllers/DisciplineResultController.cs | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 1b8ae559..e8fb21b7 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -835,6 +835,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -964,6 +971,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1171,6 +1185,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1289,6 +1310,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1405,6 +1433,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1521,6 +1556,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1637,6 +1679,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1753,6 +1802,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1869,6 +1925,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -2001,7 +2064,15 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers commandCode = r.commandCode, commandName = r.commandName, remark = r.remark, + orgRoot = p.root, + orgChild1 = p.child1, + orgChild2 = p.child2, + orgChild3 = p.child3, + orgChild4 = p.child4, + posNo = p.posMasterNo, + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.child4ShortName != null ? p.child4ShortName : "")))), }).ToList(); + var baseAPIOrg = _configuration["API"]; var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-leave-discipline"; using (var client = new HttpClient())