From 0f705431d4420bcf72b89104e0c42385621dcb6c Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Tue, 22 Apr 2025 13:25:11 +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=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=20=E0=B8=82=E0=B8=A3=E0=B8=81.=20>>=E0=B8=81=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=93=E0=B8=B5=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=81=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B9=80=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=20(=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=88=E0=B8=B8=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=B4=E0=B8=94)=20#1401?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index e61d1a10..777bef02 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -730,7 +730,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                        OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
                                        OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "\n" + (p.rootOld == null ? "" : p.rootOld),
+                                       //NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "\n" + (p.rootOld == null ? "" : p.rootOld),
+                                       NewOc = (p.position == null ? "" : $"{p.position}\n") +
+                                            (p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
+                                            (p.child4 == null ? "" : $"{p.child4}\n") +
+                                            (p.child3 == null ? "" : $"{p.child3}\n") +
+                                            (p.child2 == null ? "" : $"{p.child2}\n") +
+                                            (p.child1 == null ? "" : $"{p.child1}\n") +
+                                            (p.root == null ? "" : $"{p.root}"),
                                        NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
                                        NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
                                        NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),