From abd7fb6628d79d20a5b6caa566d33d5c5e9d625b Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 18 Oct 2023 19:31:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=A7=E0=B8=A3=E0=B8=B5=E0=B9=88=20excel=20?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A1=E0=B8=B1=E0=B8=84=E0=B8=A3=E0=B8=AA=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/PeriodExamService.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs
index 22675ad..9b0cafc 100644
--- a/Services/PeriodExamService.cs
+++ b/Services/PeriodExamService.cs
@@ -79,9 +79,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
         {
             switch (status.Trim().ToUpper())
             {
-                case "prem": return "ลูกจ้างประจำ";
-                case "temp": return "ลูกจ้างชั่วคราว";
-                case "other": return "ผู้ปฏิบัติงานอื่นในกรุงเทพมหานคร";
+                case "PREM": return "ลูกจ้างประจำ";
+                case "TEMP": return "ลูกจ้างชั่วคราว";
+                case "OTHER": return "ผู้ปฏิบัติงานอื่นในกรุงเทพมหานคร";
                 default: return status;
             }
         }
@@ -1297,7 +1297,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     summarySheet.Cells[row, 22].Value = item.ResultC;
 
                     summarySheet.Cells[row, 23].Value = item.Pass;
-                    summarySheet.Cells[row, 24].Value = item.PeriodExam.Fee <= 0 ? "ไม่มีชำระเงิน" : (item.PaymentDate == null ? "ยังไม่ชำระเงิน" : "ชำระแล้ว");
+                    summarySheet.Cells[row, 24].Value = item.PeriodExam == null || item.PeriodExam.Fee <= 0 ? "ไม่มีชำระเงิน" : (item.PaymentDate == null ? "ยังไม่ชำระเงิน" : "ชำระแล้ว");
                     summarySheet.Cells[row, 25].Value = item.PaymentDate == null ? "-" : item.PaymentDate.Value.ToThaiShortDateTime();
                     summarySheet.Cells[row, 26].Value = item.RegisterDate == null ? "-" : item.RegisterDate.Value.ToThaiShortDateTime();
                     summarySheet.Cells[row, 27].Value = item.ExamReason;
@@ -1481,7 +1481,6 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                                         CreatedAt = c.CreatedAt,
                                     })
                                     .ToListAsync();
-
             var stream = new MemoryStream();
             using (var package = new ExcelPackage(stream))
             {
@@ -1731,6 +1730,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         }
                         row++;
                     }
+                    if (careers.Count == 0)
+                        row++;
+                    Console.WriteLine(num);
                     num = num + 1;
                 }
                 summarySheet.Cells[summarySheet.Dimension.Address].AutoFitColumns();