diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 0dec80c6..5dad15fa 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -1136,9 +1136,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                         dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                         leaveTypeName = data.Type.Name,
                         fullname = fullName,
-                        positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                        position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                        positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                         positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                        organizationName = profile!.Oc ?? "",
+                        posExecutiveName = profile.PosExecutiveName,
+                        organizationName = profile!.Oc!.ToThaiNumber(),
+                        posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { (profile!.Oc!.ToThaiNumber()) }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { (profile.PosExecutiveName.ToThaiNumber()), (profile!.Oc!.ToThaiNumber()) }
+                                : new[] { (profile!.Oc!.ToThaiNumber()) },
                         leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
                         leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
                         dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -2834,7 +2853,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                         ? x.LastUpdatedAt.Value.Date.ToThaiShortDate().ToThaiNumber()
                         : "............/............/............",
                     comment = !string.IsNullOrEmpty(x.Comment)
-                        ? x.Comment.Replace("\r", "").Replace("\n", " ").Trim()
+                        ? (x.Comment.Replace("\r", "").Replace("\n", " ").Trim()).ToThaiNumber()
                         : "......................................................................................................................................................................",
                     approveType = (x.ApproveType ?? "").Trim().ToUpper()
                 })