diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs
index 9adcc57..18a24a7 100644
--- a/Services/PeriodExamService.cs
+++ b/Services/PeriodExamService.cs
@@ -658,7 +658,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                                 .Where(x => x.PeriodExam == periodExam && x.Status != "register" && x.Status != "rejectRegister")
                                 .ToListAsync();
                 if (candidate.Where(x => x.Status == "done").FirstOrDefault() != null)
-                    candidate = candidate.OrderBy(x => x.Number).ToList();
+                    candidate = candidate.OrderBy(x => Convert.ToInt32(x.Number)).ToList();
                 var i = 0;
                 foreach (var item in candidate)
                 {
@@ -676,7 +676,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                                 .Where(x => x.PeriodExam == periodExam && x.Status == status)
                                 .ToListAsync();
                 if (candidate.Where(x => x.Status == "done").FirstOrDefault() != null)
-                    candidate = candidate.OrderBy(x => x.Number).ToList();
+                    candidate = candidate.OrderBy(x => Convert.ToInt32(x.Number)).ToList();
                 var i = 0;
                 foreach (var item in candidate)
                 {
@@ -990,7 +990,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         candidate.Number = item.Number;
                         var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
                         var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สอบคัดเลือกสำเร็จ";
-                        if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email);
+                        // if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email);
                         candidate.Status = "done";
                     }
                     else
@@ -999,9 +999,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         {
                             var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
                             var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
-                            if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email);
+                            // if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email);
                         }
-                        candidate.Status = "waiver";
+                        // candidate.Status = "waiver";
                     }
                 }
                 else
@@ -1010,9 +1010,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     {
                         var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
                         var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
-                        if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email);
+                        // if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email);
                     }
-                    candidate.Status = "waiver";
+                    // candidate.Status = "waiver";
                 }
                 periodExam.SetSeat = true;
             }
@@ -1139,7 +1139,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 {
                     Id = 3,
                     Name = "จำนวนผู้เข้ารับการคัดเลือกทั้งหมด",
-                    Count = periodExam.Candidate.Where(x=>x.PaymentImg!=null).Count()
+                    Count = periodExam.Candidate.Where(x=>x.SeatNumber != null).Count()
                 },
                 new DashboardResponseItem
                 {