From 88f627a2c6427dc8d6d7290986fb60f63283b9c3 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 26 Jun 2024 22:57:50 +0700
Subject: [PATCH] array

---
 .../Controllers/CommandReportController.cs    | 44 +++++++++++++++----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
index bccde4da..fbb36e33 100644
--- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
@@ -2521,11 +2521,11 @@ namespace BMA.EHR.Report.Service.Controllers
                     RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(),
                     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,
-                    Positionno = raw_data_profile == null ? "" : raw_data_profile.positionno.ToThaiNumber(),
-                    Organizationname = raw_data_profile == null ? "" : raw_data_profile.organizationname.ToThaiNumber(),
-                    Salary = raw_data_profile == null ? "" : raw_data_profile.salary.ToThaiNumber(),
+                    Fullname = raw_data_profile == null ? "" : raw_data_profile.fullName != null ? raw_data_profile.fullName : "-",
+                    Positionname = raw_data_profile == null ? "" : raw_data_profile.positionname != null ? raw_data_profile.positionname : "-",
+                    Positionno = raw_data_profile == null ? "" : raw_data_profile.positionno != null ? raw_data_profile.positionno.ToThaiNumber() : "-",
+                    Organizationname = raw_data_profile == null ? "" : raw_data_profile.organizationname != null ? raw_data_profile.organizationname.ToThaiNumber() : "-",
+                    Salary = raw_data_profile == null ? "" : raw_data_profile.salary != null ? raw_data_profile.salary.ToThaiNumber() : "-",
 
                     OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     SignatoryBy = raw_data.AuthorizedUserFullName,
@@ -2543,6 +2543,7 @@ namespace BMA.EHR.Report.Service.Controllers
         }
 
         #endregion
+
         #region " C-PM-33 "
 
         private async Task<dynamic> GenerateCommandReportType33_Cover(Guid commandId, string exportType)
@@ -3564,7 +3565,10 @@ namespace BMA.EHR.Report.Service.Controllers
                 {
                     template = "C-PM-11",
                     reportName = "docx-report",
-                    data = contentData
+                    data = new
+                    {
+                        data = contentData
+                    }
                 };
                 return Success(data);
             }
@@ -3614,7 +3618,10 @@ namespace BMA.EHR.Report.Service.Controllers
                 {
                     template = "C-PM-12",
                     reportName = "docx-report",
-                    data = contentData
+                    data = new
+                    {
+                        data = contentData
+                    }
                 };
                 return Success(data);
             }
@@ -3953,7 +3960,10 @@ namespace BMA.EHR.Report.Service.Controllers
                 {
                     template = "C-PM-16",
                     reportName = "docx-report",
-                    data = contentData
+                    data = new
+                    {
+                        data = contentData
+                    }
                 };
                 return Success(data);
             }
@@ -4099,7 +4109,10 @@ namespace BMA.EHR.Report.Service.Controllers
                 {
                     template = "C-PM-18",
                     reportName = "docx-report",
-                    data = contentData
+                    data = new
+                    {
+                        data = contentData
+                    }
                 };
                 return Success(data);
             }
@@ -4593,6 +4606,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-26 คำสั่งให้ออกจากราชการไว้ก่อนxxxx "
 
         /// <summary>
@@ -4655,6 +4669,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-27 คำสั่งลงโทษ ภาคทัณฑ์ "
 
         /// <summary>
@@ -4717,6 +4732,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-28 คำสั่งลงโทษ ตัดเงินเดือน "
 
         /// <summary>
@@ -4779,6 +4795,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-29 คำสั่งลงโทษ ลดขั้นเงินเดือน "
 
         /// <summary>
@@ -4841,6 +4858,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-30 คำสั่งเพิ่มโทษ "
 
         /// <summary>
@@ -4903,6 +4921,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-31 คำสั่งงดโทษ "
 
         /// <summary>
@@ -4965,6 +4984,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-32 คำสั่งยุติเรื่อง "
 
         /// <summary>
@@ -5027,6 +5047,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-33 คำสั่งยุติเรื่อง "
 
         /// <summary>
@@ -5073,6 +5094,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-34 คำสั่งยุติเรื่อง "
 
         /// <summary>
@@ -5119,6 +5141,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-35 คำสั่งยุติเรื่อง "
 
         /// <summary>
@@ -5165,6 +5188,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-36 คำสั่งยุติเรื่อง "
 
         /// <summary>
@@ -5211,6 +5235,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #region " C-PM-37 คำสั่งยุติเรื่อง "
 
         /// <summary>
@@ -5257,6 +5282,7 @@ namespace BMA.EHR.Report.Service.Controllers
             }
         }
         #endregion
+
         #endregion
     }
 }