From 2cafb0b16fb794e17184f68d5857e1a53f7270cd Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Thu, 24 Aug 2023 12:56:55 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=20export=20docx=20=E0=B9=81?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=20xlsx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj          | 1 +
 BMA.EHR.Report.Service/Controllers/CommandReportController.cs | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj b/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj
index 08793443..65c50746 100644
--- a/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj
+++ b/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj
@@ -41,6 +41,7 @@
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
 		<PackageReference Include="Telerik.Reporting" Version="17.1.23.718" />
+		<PackageReference Include="Telerik.Reporting.OpenXmlRendering" Version="17.1.23.718" />
 	</ItemGroup>
 	
 	<ItemGroup>
diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
index c6a6309f..a9cde9c6 100644
--- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
@@ -87,6 +87,8 @@ namespace BMA.EHR.Report.Service.Controllers
                 report.DataSource = command;
 
                 System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
+                if(exportType == "docx")
+                    deviceInfo["OutputFormat"] = "DOCX";
 
                 InstanceReportSource instanceReportSource = new InstanceReportSource()
                 {
@@ -95,7 +97,7 @@ namespace BMA.EHR.Report.Service.Controllers
 
 
                 ReportProcessor reportProcessor = new ReportProcessor(_configuration);
-                RenderingResult result = reportProcessor.RenderReport(exportType, instanceReportSource, deviceInfo);
+                RenderingResult result = reportProcessor.RenderReport(exportType.ToUpper(), instanceReportSource, deviceInfo);
 
                 var content = result.DocumentBytes;