From 4ae2566a72d1a13a2ede7153f7a800ce901a9ba1 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Mon, 22 Jan 2024 14:36:12 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=9B=E0=B8=A5=E0=B8=87=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=82report=20=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1?= =?UTF-8?q?=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CommandReportController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs index 327b2646..0dae5639 100644 --- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs @@ -2077,7 +2077,7 @@ namespace BMA.EHR.Report.Service.Controllers ConclusionFireNo = raw_data.ConclusionFireNo == null ? "" : raw_data.ConclusionFireNo.ToThaiNumber(), ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionFireResolution = raw_data.ConclusionFireResolution, + ConclusionFireResolution = raw_data.ConclusionFireResolution == null ? "" : raw_data.ConclusionFireResolution.ToThaiNumber(), }; return command; @@ -2513,10 +2513,10 @@ namespace BMA.EHR.Report.Service.Controllers ReceiveOrganizationName = raw_data.ReceiveOrganizationName, Title = $"{raw_data.CommandSubject}", - CaseFault = raw_data.CaseFault, - FaultLevel = raw_data.FaultLevel, + CaseFault = raw_data.CaseFault == null ? "" : raw_data.CaseFault.ToThaiNumber(), + FaultLevel = raw_data.FaultLevel == null ? "" : raw_data.FaultLevel.ToThaiNumber(), RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(), - Result = raw_data.Result, + Result = raw_data.Result == null ? "" : raw_data.Result.ToThaiNumber(), Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName, Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname,