From 1f41b96844b00a8d29c68b9d807f6bc955a98628 Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 29 Jul 2025 18:28:13 +0700 Subject: [PATCH] =?UTF-8?q?Fix=20=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2=20#1680,=20#1682,?= =?UTF-8?q?=20#1683,=20#1684,=20#1685,=20#1680,#1686,=20#1687,=20#1688?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DisciplineResultController.cs | 51 ++++++++++++++----- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 82c4db32..952eb4ab 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -854,6 +854,31 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers return Success(data1); } + /// + /// ประวัติการออกคำสั่ง + /// + /// + /// + /// ค่าตัวแปรที่ส่งมาไม่ถูกต้อง + /// ไม่ได้ Login เข้าระบบ + /// เมื่อเกิดข้อผิดพลาดในการทำงาน + [HttpGet("order/history/{personId}")] + public async Task> GetOrderHistoryDiscipline(string personId) + { + var data = await _context.ProfileComplaintInvestigate + .Where(x => x.PersonId == personId) + .OrderByDescending(x => x.CreatedAt) + .ToListAsync(); + var result = data + .Select((x, idx) => new { + no = (idx + 1).ToString(), + commandSubject = x.commandType, + createdAt = x.CreatedAt + }) + .ToList(); + return Success(result); + } + /// /// ส่งรายชื่อออกคำสั่ง C-PM-19 /// @@ -940,7 +965,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -956,7 +981,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers var _result = await _res.Content.ReadAsStringAsync(); if (_res.IsSuccessStatusCode) { - data.ForEach(profile => { profile.Status = "NEW"; profile.CommandTypeId = null; }); + // คำสั่งไล่ออก หรือ ปลดออก Status หลังออกคำสั่งใช้ "REPORTED" เพื่อไม่ให้ส่งรายชื่อไปออกคำสั่งซ้ำได้ + data.ForEach(profile => { profile.Status = "REPORTED"; profile.CommandTypeId = null; }); var _profile = new List(); DateTime _date = DateTime.Now; foreach (var item in data) @@ -1076,7 +1102,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1092,7 +1118,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers var _result = await _res.Content.ReadAsStringAsync(); if (_res.IsSuccessStatusCode) { - data.ForEach(profile => { profile.Status = "NEW"; profile.CommandTypeId = null; }); + // คำสั่งไล่ออก หรือ ปลดออก Status หลังออกคำสั่งใช้ "REPORTED" เพื่อไม่ให้ส่งรายชื่อไปออกคำสั่งซ้ำได้ + data.ForEach(profile => { profile.Status = "REPORTED"; profile.CommandTypeId = null; }); var _profile = new List(); DateTime _date = DateTime.Now; foreach (var item in data) @@ -1290,7 +1317,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1415,7 +1442,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1538,7 +1565,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1661,7 +1688,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1784,7 +1811,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1907,7 +1934,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -2030,7 +2057,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -2169,7 +2196,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers orgChild3 = p.child3, orgChild4 = p.child4, posNo = p.posMasterNo != null ? p.posMasterNo.ToString() : null, - 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 : "")))), + posNoAbb = p.child4ShortName != null ? p.child4ShortName : (p.child3ShortName != null ? p.child3ShortName : (p.child2ShortName != null ? p.child2ShortName : (p.child1ShortName != null ? p.child1ShortName : (p.rootShortName != null ? p.rootShortName : "")))), }).ToList(); var baseAPIOrg = _configuration["API"];