From 708ef29ebedf090f43143a3fbb2220cc0ea5c276 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 30 Jul 2025 11:30:38 +0700
Subject: [PATCH] Fix issue #1678

---
 .../Controllers/DisciplineResultController.cs             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
index 952eb4ab..dde2cb9e 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
@@ -2247,6 +2247,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 != 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.rootShortName != null ? p.rootShortName : "")))),
                                }).ToList();
             using (var client = new HttpClient())
             {
@@ -2264,7 +2271,6 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                 }
             }
 
-
             return Success();
         }