From ffecbf7df2769ca5cd2503346d8a0a94098e4d05 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 4 Jun 2025 17:01:55 +0700
Subject: [PATCH] fix issue #1554, #1558

---
 .../Controllers/RetirementOtherController.cs  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index aa442d0b..7e902b87 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -842,6 +842,20 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   positionTypeNew = p.posTypeId,
                                   positionLevelNew = p.posLevelId,
                                   positionNameNew = p.position,
+                                  posmasterId = p.posmasterId,
+                                  posTypeNameNew = p.posTypeName,
+                                  posLeveNamelNew = p.posLevelName,
+                                  posNoNew = p.posMasterNo?.ToString(),
+                                  posNoAbbNew = 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}" : "",
+                                  orgRootNew = p.root,
+                                  orgChild1New = p.child1,
+                                  orgChild2New = p.child2,
+                                  orgChild3New = p.child3,
+                                  orgChild4New = p.child4
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
@@ -1070,6 +1084,20 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   positionTypeNew = p.posTypeId,
                                   positionLevelNew = p.posLevelId,
                                   positionNameNew = p.position,
+                                  posmasterId = p.posmasterId,
+                                  posTypeNameNew = p.posTypeName,
+                                  posLevelNameNew = p.posLevelName,
+                                  posNoNew = p.posMasterNo?.ToString(),
+                                  posNoAbbNew = 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}" : "",
+                                  orgRootNew = p.root,
+                                  orgChild1New = p.child1,
+                                  orgChild2New = p.child2,
+                                  orgChild3New = p.child3,
+                                  orgChild4New = p.child4
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];