diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
index eb90e41c..7a249021 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
@@ -1008,17 +1008,17 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        CitizenId = r.CitizenId,
                                        FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
                                        PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name,
-                                       Organization = p.OrganizationPositionOld,
-                                       PositionLevel = p.PositionLevelOld,
-                                       PositionType = p.PositionTypeOld,
-                                       PositionNumber = p.PositionNumberOld.ToThaiNumber(),
+                                       Organization = p.OrganizationPositionOld ?? "",
+                                       PositionLevel = p.PositionLevelOld ?? "",
+                                       PositionType = p.PositionTypeOld ?? "",
+                                       PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(),
                                        Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
-                                       Fault = r.Command.Fault.ToThaiNumber(),
-                                       GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
-                                       ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
+                                       Fault = r.Command.Fault == null ? "" : r.Command.Fault.ToThaiNumber(),
+                                       GuiltyBasis = r.Command.GuiltyBasis == null ? "" : r.Command.GuiltyBasis.ToThaiNumber(),
+                                       ConclusionFireNo = r.Command.ConclusionFireNo == null ? "" : r.Command!.ConclusionFireNo.ToThaiNumber(),
                                        ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
-                                       ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber()
+                                       ConclusionFireResolution = r.Command.ConclusionFireResolution == null ? "" : r.Command.ConclusionFireResolution.ToThaiNumber()
                                    })
                                    .ToList();
 
diff --git a/BMA.EHR.Report.Service/Properties/launchSettings.json b/BMA.EHR.Report.Service/Properties/launchSettings.json
index f41c4b5e..6ef9a69a 100644
--- a/BMA.EHR.Report.Service/Properties/launchSettings.json
+++ b/BMA.EHR.Report.Service/Properties/launchSettings.json
@@ -1,5 +1,15 @@
 {
     "profiles": {
+        "dotnet": {
+            "commandName": "Project",
+            "launchBrowser": true,
+            "launchUrl": "swagger",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "dotnetRunMessages": true,
+            "applicationUrl": "https://localhost:7164;http://localhost:5156"
+        },
         "http": {
             "commandName": "Project",
             "launchBrowser": true,
@@ -46,13 +56,13 @@
             "useSSL": true
         }
     },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:23132",
-      "sslPort": 44337
+    "$schema": "https://json.schemastore.org/launchsettings.json",
+    "iisSettings": {
+        "windowsAuthentication": false,
+        "anonymousAuthentication": true,
+        "iisExpress": {
+            "applicationUrl": "http://localhost:23132",
+            "sslPort": 44337
+        }
     }
-  }
 }
\ No newline at end of file