diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs index e82cea4..544cfc9 100644 --- a/Services/PeriodExamService.cs +++ b/Services/PeriodExamService.cs @@ -1370,8 +1370,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services summarySheet.Cells[row, 23].Value = item.Pass; 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, 25].Value = item.PaymentDate == null ? "-" : $"{item.PaymentDate.Value.ToThaiShortDate()} {item.PaymentDate.Value.ToString("HH:mm:ss.ffff")}";//xxxxxxxxxxxx + summarySheet.Cells[row, 26].Value = item.RegisterDate == null ? "-" : $"{item.RegisterDate.Value.ToThaiShortDate()} {item.RegisterDate.Value.ToString("HH:mm:ss.ffff")}"; summarySheet.Cells[row, 27].Value = item.ExamReason; row++; } @@ -1744,7 +1744,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services summarySheet.Cells[row, 57].Value = item.ResultC; summarySheet.Cells[row, 58].Value = item.Pass; summarySheet.Cells[row, 59].Value = item.CreatedAt.Date.ToThaiShortDate(); - summarySheet.Cells[row, 60].Value = item.RegisterDate == null ? "-" : item.RegisterDate.Value.ToThaiShortDateTime(); + summarySheet.Cells[row, 60].Value = item.RegisterDate == null ? "-" : $"{item.RegisterDate.Value.ToThaiShortDate()} {item.RegisterDate.Value.ToString("HH:mm:ss.ffff")}";//xxxxxxxxxx var careers = await _context.Careers .AsQueryable()