diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
index 0dae5639..6152899d 100644
--- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
@@ -1967,10 +1967,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,
@@ -2060,10 +2060,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,