diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
index 4dbc1b5b..2d9cfbde 100644
--- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
@@ -143,7 +143,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -262,7 +262,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -381,7 +381,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -500,7 +500,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -620,7 +620,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -741,7 +741,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -860,7 +860,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -981,7 +981,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -1105,7 +1105,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -1399,7 +1399,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -1521,7 +1521,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -1640,7 +1640,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
 
@@ -1830,7 +1830,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName;
                 report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber();
                 report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber();
-                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber();
+                report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate2().ToThaiNumber();
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();