diff --git a/Controllers/ExamReportController.cs b/Controllers/ExamReportController.cs
index a2c8c66..5279ba7 100644
--- a/Controllers/ExamReportController.cs
+++ b/Controllers/ExamReportController.cs
@@ -477,7 +477,7 @@ namespace BMA.EHR.Report.Service.Controllers
                                                 //University = p.Educations.First().University,
                                                 //PositionName = p.PositionName,
                                                 ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round.ToString().ToThaiNumber()}/{p.PeriodExam.Year.Value.ToThaiYear().ToString().ToThaiNumber()}",
-                                                Number = sr == null ? "๐" : sr.Number,
+                                                Number = sr == null || sr.Number == null ? 0 : Convert.ToInt32(sr.Number),
                                                 //FullA = sr == null ? "๐" : (sr.FullA.ToString()),
                                                 //SumA = sr == null ? "๐" : (sr.SumA.ToString()),
                                                 //FullB = sr == null ? "๐" : (sr.FullB.ToString()),
@@ -486,7 +486,6 @@ namespace BMA.EHR.Report.Service.Controllers
                                                 //SumC = sr == null ? "๐" : (sr.SumC.ToString()),
                                                 SumScore = sr == null
                                                     ? "๐"
-                                                    //: (((sr.SumA > 0 ? sr.SumA : 0) + /*sr.SumB +*/ (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
                                                     : (((sr.SumA > 0 ? sr.SumA : 0) + (sr.SumB > 0 ? sr.SumB : 0) + (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
                                             })
                                     .OrderBy(x => x.Number)
@@ -496,10 +495,11 @@ namespace BMA.EHR.Report.Service.Controllers
 
                 if (data.Count == 0)
                     return Error("ไม่พบข้อมูลในระบบ");
+
                 var data_ = data.Select(x => new
                 {
                     x.ExamName,
-                    Number = x.Number.ToThaiNumber(),
+                    Number = x.Number.ToString().ToThaiNumber(),
                     x.ExamId,
                     x.FullName,
                     x.SumScore
diff --git a/Controllers/RecruitReportController.cs b/Controllers/RecruitReportController.cs
index abff95f..b86ae63 100644
--- a/Controllers/RecruitReportController.cs
+++ b/Controllers/RecruitReportController.cs
@@ -402,7 +402,7 @@ namespace BMA.EHR.Report.Service.Controllers
         {
             try
             {
-                var data = await _context.Recruits.AsQueryable()
+                var data = await _context.Recruits.AsQueryable() 
                                     .Include(x => x.RecruitImport)
                                     .ThenInclude(x => x.ScoreImport)
                                     .Include(x => x.Documents)
@@ -435,8 +435,7 @@ namespace BMA.EHR.Report.Service.Controllers
                                                      ? ""
                                                      : $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order.ToString().ToThaiNumber()}/{p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber()}",
 
-
-                                                Number = sr.Number == null ? "๐" : sr.Number,
+                                                Number = sr == null || sr.Number == null ? 0 : Convert.ToInt32(sr.Number),
                                                 //ExamCount = _recruitService.GetExamCount(p.CitizenId),
                                                 //ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
 
@@ -449,19 +448,20 @@ namespace BMA.EHR.Report.Service.Controllers
                                                 //SumC = sr.SumC == null ? 0.0 : sr.SumC,
                                                 SumScore = sr == null
                                                     ? "๐"
-                                                    : (((sr.SumA > 0 ? sr.SumA : 0) + /*sr.SumB +*/ (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
+                                                    : (((sr.SumA > 0 ? sr.SumA : 0) + (sr.SumB > 0 ? sr.SumB : 0) + (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
                                             })
                                     .OrderBy(x => x.Number)
                                     .Where(x => x.Id == id)
                                     .Where(x => x.ExamResult == "ผ่าน")
                                     .ToListAsync();
 
-                if (data.Count == 0) return Error("ไม่พบข้อมูลในระบบ");
+                if (data.Count == 0) 
+                    return Error("ไม่พบข้อมูลในระบบ");
 
                 var data_ = data.Select(x => new
                 {
                     x.ExamName,
-                    Number = x.Number.ToThaiNumber(),
+                    Number = x.Number.ToString().ToThaiNumber(),
                     x.ExamId,
                     x.FullName,
                     x.SumScore