diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs
index 5868c40..9a0f6bd 100644
--- a/Controllers/RecruitController.cs
+++ b/Controllers/RecruitController.cs
@@ -2281,9 +2281,9 @@ namespace BMA.EHR.Recruit.Service.Controllers
                   {
                       positionName = group.Key.PositionName,
                       gender = group.Key.Gender,
-                      age = group.Key.Age,
+                      age = group.Key.Age.ToString().ToThaiNumber(),
                       degree = group.Key.Degree,
-                      amount = group.Count()
+                      amount = group.Count().ToString().ToThaiNumber()
                   })
                   .ToList();
 
@@ -2291,7 +2291,11 @@ namespace BMA.EHR.Recruit.Service.Controllers
                 {
                     template = "recruit-officer-pre",
                     reportName = "xlsx-report",
-                    data = new { list = groupedResult }
+                    data = new {
+                        year = year.ToString().ToThaiNumber(),
+                        date = DateTime.Now.ToThaiShortDateWithPrefix().ToThaiNumber(),
+                        list = groupedResult 
+                    }
                 };
 
 
@@ -2367,10 +2371,10 @@ namespace BMA.EHR.Recruit.Service.Controllers
                     {
                         positionName = group.Key.PositionName,
                         gender = group.Key.Gender,
-                        age = group.Key.Age,
+                        age = group.Key.Age.ToString().ToThaiNumber(),
                         degree = group.Key.Degree,
                         result = group.Key.Result,
-                        amount = group.Count()
+                        amount = group.Count().ToString().ToThaiNumber()
                     })
                     .ToList();
 
@@ -2378,7 +2382,11 @@ namespace BMA.EHR.Recruit.Service.Controllers
                 {
                     template = "recruit-officer-pass",
                     reportName = "xlsx-report",
-                    data = new { list = groupedResult }
+                    data = new {
+                        year = year.ToString().ToThaiNumber(),
+                        date = DateTime.Now.ToThaiShortDateWithPrefix().ToThaiNumber(),
+                        list = groupedResult
+                    }
                 };
                 return Success(result);