Fix ระบบวินัย #1680, #1682, #1683, #1684, #1685, #1680,#1686, #1687, #1688

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

@@ -854,6 +854,31 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
             return Success(data1);
         }
 
+        /// <summary>
+        /// ประวัติการออกคำสั่ง
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("order/history/{personId}")]
+        public async Task<ActionResult<ResponseObject>> 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);
+        }
+
         /// <summary>
         /// ส่งรายชื่อออกคำสั่ง C-PM-19
         /// </summary>
@@ -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<ProfileComplaintInvestigate>();
                     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<ProfileComplaintInvestigate>();
                     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"];