From f74c8a1e3858ce6689022dbed16310b4f0203126 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Thu, 20 Feb 2025 11:50:10 +0700 Subject: [PATCH] fix date --- BMA.EHR.Insignia/Controllers/InsigniaReportController.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs b/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs index bdd8af28..22efd743 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs @@ -18,6 +18,7 @@ using Newtonsoft.Json.Linq; using OfficeOpenXml; using RabbitMQ.Client; using Swashbuckle.AspNetCore.Annotations; +using System.Globalization; using System.Security.Claims; using System.Text; using static System.Runtime.InteropServices.JavaScript.JSType; @@ -344,12 +345,14 @@ namespace BMA.EHR.Insignia.Service.Controllers var org = ""; var number = ""; var citizenId = "0"; + var datePayment = ""; foreach (var _data in insignalPeriod) { citizenId = _data.GetType().GetProperty("CitizenId").GetValue(_data); org = _data.GetType().GetProperty("Root").GetValue(_data); number = _data.GetType().GetProperty("Number").GetValue(_data); - var datePayment = _data.GetType().GetProperty("DatePayment").GetValue(_data); + datePayment = _data.GetType().GetProperty("DatePayment").GetValue(_data); + DateTime datePayment2 = DateTime.ParseExact(datePayment, "yyyy-MM-dd", CultureInfo.InvariantCulture); detailList.Add(new { row = row.ToString().ToThaiNumber(), @@ -365,12 +368,12 @@ namespace BMA.EHR.Insignia.Service.Controllers isApprove = _data.GetType().GetProperty("IsApprove").GetValue(_data), requestInsignia = _data.GetType().GetProperty("RequestInsignia").GetValue(_data), number = number == null ? "" : number.ToString().ToThaiNumber(), - datePayment = datePayment == null ? "" : datePayment.ToThaiShortDate().ToThaiNumber(), + datePayment = datePayment == null ? "" : datePayment2.ToThaiShortDate().ToThaiNumber(), }); row = row + 1; } - var date = $"ณ วันที่ {(DateTime.Now.Date).ToThaiShortDate().ToThaiNumber()}"; + var date = $"ณ วันที่ {DateTime.Now.Date.ToThaiShortDate().ToThaiNumber()}"; var result = new { template = "reportInsignia4",