diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
index 33db52c8..ff5b3af3 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
@@ -905,7 +905,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   refCommandNo = $"{r.commandNo}/{r.commandYear}",
                                   salaryRef = r.templateDoc,
                                   isLeave = true,
-                                  leaveReason = "ได้รับโทษทางวินัย ไล่ออกจากราชการ",
+                                  leaveReason = "ได้รับโทษทางวินัย ออกจากราชการ",
                                   dateLeave = r.commandAffectDate,
                                   refCommandDate = DateTime.Now,
                                   detail = p.DisciplineDisciplinary.Title,
diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
index 0f95ba29..57a2fcd9 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
@@ -111,8 +111,8 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
 
                                 Position = x.Position,
                                 PosNo = x.PosNo,
-                                PositionLevel = x.PositionLevel,
-                                PositionType = x.PositionType,
+                                PositionLevel = x.PositionLevel == null ? "" : x.PositionLevel,
+                                PositionType = x.PositionType == null ? "" : x.PositionType,
                                 Salary = x.Salary,
                                 Status = x.Status,
                                 DescriptionSuspend = x.DescriptionSuspend,
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 03719510..d4ef995e 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -2623,14 +2623,25 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                        No = r.Sequence.ToString().ToThaiNumber(),
                                        CitizenId = r.CitizenId == null ? "-" : r.CitizenId.ToThaiNumber(),
                                        FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
-                                       PositionName = p.PositionOld ?? "",
-                                       Organization = p.OrganizationPositionOld ?? "",
-                                       PositionLevel = p.PositionLevelOld ?? "",
-                                       PositionType = p.PositionTypeOld ?? "",
-                                       PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(),
-                                       ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
-                                       Remark = p.Reason ?? "",
+                                       PositionName = p.PositionOld ?? "-",
+                                       Organization = p.OrganizationPositionOld ?? "-",
+                                       Oc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
+                                         p.child4Old != null
+                                             ? p.PositionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
+                                         p.child3Old != null
+                                             ? p.PositionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
+                                         p.child2Old != null
+                                             ? p.PositionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
+                                         p.child1Old != null
+                                             ? p.PositionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child1Old}/{p.rootOld}" :
+                                         p.rootOld != null
+                                             ? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-",
+                                       PositionLevel = p.PositionLevelOld ?? "-",
+                                       PositionType = p.PositionTypeOld ?? "-",
+                                       PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
+                                       ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
+                                       Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Remark = p.Reason ?? "-",
                                        RemarkHorizontal = r.RemarkHorizontal,
                                        RemarkVertical = r.RemarkVertical,
                                    }).ToList();