diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
index 12379e65..48abbadd 100644
--- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
@@ -482,6 +482,8 @@ namespace BMA.EHR.Application.Repositories.Reports
                             p.SendDate,
                             p.ActiveDate,
                             p.Reason,
+                            p.ReasonResign,
+                            p.Remark,
                             p.Status,
                             salary = p.AmountOld,
                             p.ApproveReason,
@@ -517,6 +519,8 @@ namespace BMA.EHR.Application.Repositories.Reports
                             p.SendDate,
                             p.ActiveDate,
                             p.Reason,
+                            p.ReasonResign,
+                            p.Remark,
                             p.Status,
                             salary = p.AmountOld,
                             p.ApproveReason,
@@ -547,11 +551,14 @@ namespace BMA.EHR.Application.Repositories.Reports
                 data.prefix,
                 data.firstName,
                 data.lastName,
-                data.Location,
+                Location = string.IsNullOrEmpty(data.Location) ? string.Empty : data.Location.ToThaiNumber(),
                 FullName = $"{data.prefix}{data.firstName} {data.lastName}",
                 SendDate = string.IsNullOrEmpty(data.SendDate.ToString()) ? string.Empty : DateTime.Parse(data.SendDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
                 ActiveDate = string.IsNullOrEmpty(data.ActiveDate.ToString()) ? string.Empty : DateTime.Parse(data.ActiveDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
                 data.Reason,
+                data.ReasonResign,
+                data.Remark,
+                ReasonRemark = data.Reason == "OTHER" ? string.IsNullOrEmpty(data.Remark) ? data.ReasonResign : $"{data.ReasonResign}({data.Remark})" : data.ReasonResign,
                 data.Status,
                 data.salary,
                 data.PositionTypeOld,