From 25bac519eccaa23878397696d0f99f36376c6434 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 12 Jan 2024 09:53:10 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/CommandReportController.cs    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
index 5cd07787..e2d19d57 100644
--- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
@@ -2,6 +2,7 @@
 using BMA.EHR.Domain.Common;
 using BMA.EHR.Domain.Extensions;
 using BMA.EHR.Domain.Shared;
+using iTextSharp.text.pdf;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -1976,6 +1977,14 @@ namespace BMA.EHR.Report.Service.Controllers
                     Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno,
                     Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname,
                     Salary = raw_data_profile == null ? "" : raw_data_profile.Salary,
+
+                    OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
+                    SignatoryBy = raw_data.AuthorizedUserFullName,
+                    SignatoryPosition = raw_data.AuthorizedPosition,
+
+                    ConclusionFireNo = raw_data.ConclusionFireNo,
+                    ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
+                    ConclusionFireResolution = raw_data.ConclusionFireResolution,
                 };
 
                 return command;
@@ -2061,6 +2070,10 @@ namespace BMA.EHR.Report.Service.Controllers
                     Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno,
                     Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname,
                     Salary = raw_data_profile == null ? "" : raw_data_profile.Salary,
+
+                    OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
+                    SignatoryBy = raw_data.AuthorizedUserFullName,
+                    SignatoryPosition = raw_data.AuthorizedPosition,
                 };
 
                 return command;
@@ -2506,6 +2519,12 @@ namespace BMA.EHR.Report.Service.Controllers
                     Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno,
                     Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname,
                     Salary = raw_data_profile == null ? "" : raw_data_profile.Salary,
+
+                    OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
+                    SignatoryBy = raw_data.AuthorizedUserFullName,
+                    SignatoryPosition = raw_data.AuthorizedPosition,
+
+                    CreatedAt = raw_data.CreatedAt.ToThaiFullDate3().ToThaiNumber(),
                 };
 
                 return command;