From 24bc8523417701ad65b644cb5f3df1315c936e8e Mon Sep 17 00:00:00 2001
From: "Harid Promsri (Bright)" <harid_pr61@live.rmutl.ac.th>
Date: Wed, 23 Aug 2023 13:50:44 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20api=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81=E0=B8=B2=E0=B8=A8=E0=B9=80?=
 =?UTF-8?q?=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?/=20move=20old=20template?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/RetireReportRepository.cs         |  23 ---------
 .../Controllers/RetireReportController.cs     |  45 +++++++++++++++---
 .../Reports/31-ประกาศเกษียณข้าราชการ-1.trdp     | Bin 28595 -> 29087 bytes
 .../Reports/31-ประกาศเกษียณข้าราชการ-2.trdp     | Bin 28478 -> 28955 bytes
 .../Reports/31-ประกาศเกษียณข้าราชการ-3.trdp     | Bin 28478 -> 28974 bytes
 .../{ => Old}/คำสั่งบรรจุ-examination.trdp       | Bin
 .../{ => Old}/คำสั่งบรรจุ-examinationHead.trdp   | Bin
 .../Reports/{ => Old}/คำสั่งย้าย-transfer.trdp   | Bin
 .../{ => Old}/คำสั่งย้าย-transferHead.trdp       | Bin
 .../{ => Old}/คำสั่งแต่งตั้ง-appointment.trdp      | Bin
 .../{ => Old}/คำสั่งแต่งตั้ง-appointmentHead.trdp  | Bin
 .../Reports/{ => Old}/ภาคผนวก23-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก23-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก23-3.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก23-4.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก23-5.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก23-6.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก23-7.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก23-8.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก24-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก24-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก24-3.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก25-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก25-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก25-3.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก25-4.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก26-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก26-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก26-3.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก26-4.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก27-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก27-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก28-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก28-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก28-3.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก29-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก29-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก30.trdp          | Bin
 .../Reports/{ => Old}/ภาคผนวก31.trdp          | Bin
 .../Reports/{ => Old}/ภาคผนวก32.trdp          | Bin
 .../Reports/{ => Old}/ภาคผนวก33.trdp          | Bin
 .../Reports/{ => Old}/ภาคผนวก34-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก34-10.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-11.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-12.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-13.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-14.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-15.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-16.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-17.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-18.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-19.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก34-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก34-3.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก34-4.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก34-5.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก34-6.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก34-7.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก34-8.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก34-9.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-10.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก35-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-3.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-4.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-5.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-6.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-7.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-8.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก35-9.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก36-1.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก36-2.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก36-3.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก36-4.trdp        | Bin
 .../Reports/{ => Old}/ภาคผนวก36-5.trdp        | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ1.trdp       | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ10.trdp      | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ11.trdp      | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ2.trdp       | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ3.trdp       | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ4.trdp       | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ5.trdp       | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ6.trdp       | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ7.trdp       | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ8.trdp       | Bin
 .../{ => Old}/ภาคผนวก59-เครื่องราชฯ9.trdp       | Bin
 .../Reports/{ => Old}/ภาคผนวก7.trdp           | Bin
 .../Reports/{ => Old}/ภาคผนวก8.trdp           | Bin
 88 files changed, 39 insertions(+), 29 deletions(-)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/คำสั่งบรรจุ-examination.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/คำสั่งบรรจุ-examinationHead.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/คำสั่งย้าย-transfer.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/คำสั่งย้าย-transferHead.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/คำสั่งแต่งตั้ง-appointment.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/คำสั่งแต่งตั้ง-appointmentHead.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก23-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก23-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก23-3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก23-4.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก23-5.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก23-6.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก23-7.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก23-8.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก24-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก24-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก24-3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก25-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก25-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก25-3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก25-4.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก26-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก26-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก26-3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก26-4.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก27-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก27-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก28-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก28-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก28-3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก29-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก29-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก30.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก31.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก32.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก33.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-10.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-11.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-12.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-13.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-14.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-15.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-16.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-17.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-18.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-19.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-4.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-5.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-6.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-7.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-8.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก34-9.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-10.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-4.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-5.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-6.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-7.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-8.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก35-9.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก36-1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก36-2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก36-3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก36-4.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก36-5.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ1.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ10.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ11.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ2.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ3.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ4.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ5.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ6.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ7.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ8.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก59-เครื่องราชฯ9.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก7.trdp (100%)
 rename BMA.EHR.Report.Service/Reports/{ => Old}/ภาคผนวก8.trdp (100%)

diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
index 53f7141e..82eace7f 100644
--- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
@@ -3,8 +3,6 @@ using BMA.EHR.Domain.Extensions;
 using BMA.EHR.Domain.Models.Retirement;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
-//using Telerik.Reporting;
-//using Telerik.Reporting.Processing;
 
 namespace BMA.EHR.Application.Repositories.Reports
 {
@@ -123,27 +121,6 @@ namespace BMA.EHR.Application.Repositories.Reports
 
                 return new { retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire };
             }
-
-            //Report
-            //var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"32-ประกาศเกษียณลูกจ้างประจำ.trdp");
-            //ReportPackager reportPacker = new ReportPackager();
-            //Telerik.Reporting.Report? report = null;
-
-            //using (var sourceStream = System.IO.File.OpenRead(rptFile))
-            //{
-            //    report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
-            //}
-
-            //System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
-            //InstanceReportSource instanceReportSource = new InstanceReportSource()
-            //{
-            //    ReportDocument = report,
-            //};
-
-            //ReportProcessor reportProcessor = new ReportProcessor(_configuration);
-            //RenderingResult result = reportProcessor.RenderReport("PDF", instanceReportSource, deviceInfo);
-            //var content = result.DocumentBytes;
-            //return File(content, "application/pdf", $"ประกาศเกษียณลูกจ้างประจำ_{null}.pdf");
         }
 
         #endregion
diff --git a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs
index 27b829c7..c97e98e0 100644
--- a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs
@@ -2,6 +2,7 @@
 using BMA.EHR.Domain.Extensions;
 using BMA.EHR.Application.Repositories.Reports;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
 using Swashbuckle.AspNetCore.Annotations;
 using Telerik.Reporting;
 using Telerik.Reporting.Processing;
@@ -12,8 +13,8 @@ namespace BMA.EHR.Report.Service.Controllers
     [ApiVersion("1.0")]
     [ApiController]
     [Produces("application/json")]
-    //[Authorize]
-    [SwaggerTag("API รายงานระบบเกษียณ")]
+    [Authorize]
+    [SwaggerTag("รายงานระบบเกษียณ")]
     public class RetireReportController : BaseController
     {
         private readonly RetireReportRepository _service;
@@ -33,11 +34,44 @@ namespace BMA.EHR.Report.Service.Controllers
             var retire = await _service.GetProfileRetirementdAsync(Id);
             if (retire == null)
             {
-                return NotFound(retire);
+                return NotFound();
             }
             else
             {
-                var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"32-ประกาศเกษียณลูกจ้างประจำ.trdp");
+                var reportfile = "";
+                var returnfile = "";
+                switch (retire.GetType().GetProperty("Type").GetValue(retire))
+                {
+                    case "OFFICER":
+                        if (retire.GetType().GetProperty("TypeReport").GetValue(retire) == "ADD")
+                        {
+                            reportfile = $"31-ประกาศเกษียณข้าราชการ-1.trdp";
+                            returnfile = $"ประกาศเกษียณข้าราชการ.pdf";
+                        }
+                        else if (retire.GetType().GetProperty("TypeReport").GetValue(retire) == "EDIT")
+                        {
+                            reportfile = $"31-ประกาศเกษียณข้าราชการ-2.trdp";
+                            returnfile = $"แก้ไขประกาศเกษียณข้าราชการ.pdf";
+                        }
+                        else if (retire.GetType().GetProperty("TypeReport").GetValue(retire) == "REMOVE")
+                        {
+                            reportfile = $"31-ประกาศเกษียณข้าราชการ-3.trdp";
+                            returnfile = $"ยกเลิกประกาศเกษียณข้าราชการ.pdf";
+                        }
+                        else
+                        {
+                            return Error(retire.GetType().GetProperty("TypeReport").ToString());
+                        }
+                        break;
+                    case "EMPLOYEE":
+                        reportfile = $"32-ประกาศเกษียณลูกจ้างประจำ.trdp";
+                        returnfile = $"ประกาศเกษียณลูกจ้าง";
+                        break;
+                    default:
+                        return BadRequest(retire);
+                }
+
+                var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", reportfile);
                 ReportPackager reportPacker = new ReportPackager();
                 Telerik.Reporting.Report? report = null;
                 using (var sourceStream = System.IO.File.OpenRead(rptFile))
@@ -78,9 +112,8 @@ namespace BMA.EHR.Report.Service.Controllers
                 ReportProcessor reportProcessor = new ReportProcessor(_configuration);
                 RenderingResult result = reportProcessor.RenderReport("PDF", instanceReportSource, deviceInfo);
                 var content = result.DocumentBytes;
-                return File(content, "application/pdf", $"ประกาศเกษียณลูกจ้างประจำ{null}.pdf");
+                return File(content, "application/pdf", returnfile);
             }
-            //return Success(retire);
         }
 
 
diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp
index 5e28cec743aab0b2d207a6e0e72ecfc4f798d094..aef012060afd5259920fd4c4b88b7124ed69e64d 100644
GIT binary patch
delta 1905
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

delta 1436
zcmV;N1!MZ3;{mhZ0S!<~0|XQR000O8O>Y#j4U=dNO>Y!e;a1oa2?YQEkq?uuXfS`p
zS6^=%MG${S;ybJk34<!`Y$r}DYPU)n(v&ull{2k)JnW5q;(TY_t!cs&hDuI>KG4)@
zogj-Opp;gTplQna+w4bScJ}sscHG)(gOHrd?(FQ$Z)Sh{XYyA!>JIsa`ho4a1udhe
zHA3C8SFzn{L2I)0PcCU!ue|?WevN-NJfD#}c7@eIZ?0U|$f{MR1&xQl@$dx?@A2?g
z9(H+n#KYD_jhHp>uIXBh>%LtnXeGZ%H3H7uprF+lYkX=LLAgfjR-iNLP~ZMqFMD;v
zM?c`*$fmP1Mn=zQ;GU5D4Myt$HledfnPodBEi-^kmZ@E>F+eplKvhX<L^gkLs>wDT
z8h1gk<hd-GR9Ysc<y&7hU9w8=LJ0P^R0P{#8ZibYjA0u?&`?mc%dF|s1#g4gs9ROA
zVc`G3Xv8BK{kG*asa{;YuBo&leiaRNZqapU&gmCLr{pyXT3WOK7%q@mwj5gYJ<OTs
zT8>6m>^d!NHo&JXTpA6xs&aplaIPibj!DYv6H_#ACUY?^A3`$7KvG<y8%!i+h(#*i
ztUf!4I3343qi01MlU2|PDIV_e@Q{ap0n3ngPmy}tC^<#~hB$PHzkQ_!?Pu5k$=^JD
zz{Br(|GpZ6?~e&hIUVe@dH*{eKIUN$Cq74oE_xg__~8c|i<jXue;I%0!0<o3zlE6E
zg!g|CvxUQRb}Mv*K^Waad25ViVXdd+GEdMrKwr}4E_!L9@t4?zG@oMQP)YjO-sb(E
z2eE!MFd&?Ofj@EH0WQhF&&M(a-N-?NSo&xye{xy(and#c$T}>qPEr?AOEz^Xf&L}6
z{FI_IlWdwD$7Ld@Ht&DfRXEhHQI}C)J5PE?L{7@gn$@6+**VE&MeVfYu%vcQpNYwx
z(-Q}2AS`6ZMsu6O{)W9CMYLj9Dh@rzh!lQtaEw~LWxG@cw`lwFJS}LS-5FzajD<)#
z^&ybcFO53{=0=WyM@XO}q}I9br=NKE3U_WBg{SYnU4(Z5;17S~_ZEIT2>TelOy0p$
zZ!=*S;t=-Q%54XuIl}n5n1)l3z=r&Vpn8bN<Q2X@*mk`CkoRHk4txn3+T;B;n&?D;
z`!HjVC;(5<!vS_rQ11nX)KU4phbXWe9R_l*cVxf<5x676=^9meh`1w_=W3yP>hy>+
zx2x9k0X8})If;K}3G8hIx0}HF=1bw3N+afQuzEXqputf0Z0<nsF*zH<leY`t<vYhP
z)sBe6P*K3|5gERCkI`!jk?o=hfe(~gy7(iCuZoIE*1^w6n2yM`pSUo`aTOH>+~1LD
zTbPcPVt$t-EuLXe1nyW*0G$3gFr@j$(Bimurj1L|S@?enQCB{udrI*M93LY)QH1^q
zSMV*~6g~7k;S41I%cFw4?vNXONC-?Ps?_Mh^MIt*<@=!IG0RDj3n>NbfQZXN1SJnH
zNc#QJ2Sjet1LE^$!0h$S|MUfsH--uvW2nNB6;MJWUxcT<Ntq~=0#bw<*1u`HP-e}~
z!sThXm7srYi4tJRasnv3t^rWnZF<cBRh3*hTe1AA?G7p!CHNw`hw;6#7QNErJ2|6g
zbE320G3M2wFFHmXK+-7G0|~rRgefs=lrl91C2P%OWpyTRMXMr8(+F5r6lMz8gd)v^
zBD2gqf2dFsuN5^wWYr`VMkIQ{5}7k5XfLz66D=U+i1!h95uP}_sIL-`H)Mf*<zG-s
z0|XQR000O8O>Y#F;BW2&O>Y#F(Qro&O>Y!e;a1oa2?YQEkq?t5aV{ZEZxmOCG{v2w
q0002*0000J0000000000000000OxH0lkjg8lZkN<2G(u>0000;HJ;1>

diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-2.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-2.trdp
index 359c400a27201908617462f12a0b2dc7d1e682c6..e931377219a8f7ef3573025d36b1c7ecbf04e4de 100644
GIT binary patch
delta 1793
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

delta 1312
zcmV+*1>gFc;sL(i0S!<~0|XQR000O8H*plP4U=dNH*pkKEfKQYlmq|(2N9F5Xfc0S
z-EJF26uw8|9Y%|UTUG4FcAQXZw@Mn)ls1u-HLbW@?1{Z%f2`dxO?p*Br8KDAke0|4
zRU}bVpsGX*h26KAN8!ww9eeC<lM<zY3na^)IXiQHzB%XHIj&w>_dW6@jbb+pYDUqV
zG6)TtVapBLHKWJYKKRhMbn)GHs;hsr8%B)WbX%+g>t>q1K~@}})(oEf#FH01xyzFu
zc{1S16Q1;E4Ptk~TXx`duS9OEW;CK6H3%3B;+oN6toxB=#mx@&o!Dg5qmlcC*$jOv
zLOWpHDovHjR?#dPV4jfbRYv_7hcH>7%yB)NHW|20mZ;nAFz~88@~Wk;$aH_;R-0{j
zbT|dUVi>S&Q)7wPPUL*v3&;w+1tGY%sR*{q3}TH`SmQdzTth+KZL(fO=fib!)py#U
z!@}R#>JFb2%^Qx_qh@{OilJad|5Y?NxlY$$IAhL=Nh9pmj43e!$MAscrsL6i6e4C}
z;CKdEc758|=z>jGn6$b<TVa2q88<X{b3l1LFm?Nyjzu0GLNY=?7dPlS6QGP`k&3ru
zPLCp<8pc~TOJa;*)r?w!Cy#it&y(LE%P{YL#?;$J$umsA1Rw3=XICwQ@vk@l$#b53
z%agBox}_e$_cz)~xgGRu^7IZ*c6jm_H$KG$1GG4)@csAJ7cRip+y#H!1CRgW={@vm
zlkl`Jw1UC(uCV;?1o8AA1@X05Dzu+4P-2Zx2v6^!yq}|4XnU;W5)>Hhp)INN2ei^h
z<$vH5Fnx)GeI-e8yv@`5qrlFL6bK`r;1}Gthxm`|oFxdsATyA8ENyHmd-4o-anm*d
zmrXcJlN8Ps7G3JKV)K79>O=){jugllG`EFe$(UqtduIzoRVb4MGM!hRL{!h5=eB{T
zFVle0$T-Q0&1zGZ*&U}#Rk2oNd8%ril4U8YwPKcs^;$8tcS9^RlyalFL4mS>zOsmx
z-B!z^Cm50PUvS~1*6VISWpE2_BwrCV<Kvq-N^>-1(l_R{qIrM5T+Cy(nF(HdsEXu2
zN^p?g2blU#a6Z6oFM;ErP`=~o4nbABSWmKs2J*>6o_^2M2dBj?nR9Q0TOQ?d3ps>R
z?&nd8hQu+*MaPt2oWHAk*8rG@6xKBA5zI4W8iMPdOLK(@(y1IpI-m4n=B{nLZPq#B
zl2AEc$}6T>Rb_vpf)YnD(BHyZPV6GmC!Ty+K^*H1_eL+JSM}(*bO?hyKo>Vra)2(r
zz>GP-!882y4{=u}+MkGrD&AAS)9A4t>wu2QJ3Ig1Y4A=nMl6TjXo!|@1FVUyNxI2x
zK~9@)s@7OrX^r)jvhUPZRO`@C*_4U)G$wVp1Vq=|0GfZ>xoIFICuqe@M>JlGju%6-
zdl?*cgI?H+ajB9kW6Ms|c7svhs05#8+=f@G)r|IrJXbVJ6)~9)84G=wi-|Q1KvxP~
znC7n(AtZK(Ql_?`WVNUFv#;P*cUs~Pfy}XzXor<!N3_N^wDwIFMq}-<xKODFME0uU
zU<A<fjzB5SI%4$_^S$gSC#+AH%lsLJm(3LbRZIS@aq(|ZO9KQH0000805@?IlU#4^
z12=ILlTC0(4mWWWS1l2;+mr+V00$A1qHr!CH*pkKhBU>Uq5uE@?*IS*6951J00000
W000000044rlkjjQ24QXh00015Zf+w0

diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-3.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-3.trdp
index fdf736279e4ac1f59f098cbd372733497f8c1909..189edb483a3741c75fb3e7e065921835254ddcf8 100644
GIT binary patch
delta 1813
zcmV+w2kQ8~-T|)S0S!<~0|XQR000O8vTYZ!4U=dNvTYYvruHu-ga!Zr9UhaeXfS`}
zSzC|OMihRp)c-JYr7mdIaqL_+DG7*O%B5TyZ5B`;O+1@eICf+^WtXRJTWO)9F9o{V
zQlTyg^@5NJrLFUC{8Kt}?6JqrYzWc9qE=dE?K5Z2<(qRpk3G#38v`4CK|J4botC2E
zl7fiSbxq6ZwUkk?{!v{yas2)FnyY_g=z0OVYMDWw>eadf1zj=*q@_gR&r$dy3crcM
zpQ3O#3V(^httAC@`tFU6V+_xDmf2F)yb)0lb>{djr5^;tk5$$0_Q}BTaX@V1S=Vvb
z9jG4oq25)!q?c6<YYKIbQ1e_s20mQUn^Pn(EW1Ox0Sz0SC04H=u&D4-7MFi1>LgZR
zawpidNqS2Kr(GvVCas-C9m6xOjU04|+@MKVHwiO53>2hhCe*x*TyP+0Tisyfk!5!S
zof{ZEYD0zpzB)`tG<?OdM+CPool!WjWfnir2W~Eqb$Xd(w&o67N{L<3z+j0wUBf1A
z&jr+6$FLQ2(HfAo%^~$^F_(Yp(CKkZ1m}tnt^}0*foXTni&)6;V3G_0QM^Vr0tO1N
zqbjadYhuniUTSDr-X&bFRMO0K+$c5J9RSx-S_@J5APOHx;UBc-pbCG5Lc9x-XHbqI
z3_XUwJ+4Nte}@Yyc^-w|Md4S`_%<J+zuyX)@pNiuI~so(g*#FB5GH><1%+MkSTy+I
z2OFo3(VvsYU=AJrCmP>^n6^<AK4Mncz>_F^2_6n5kEgGd$Jb1iSwCQ`m<}^YM{j|A
zOJbQ>d&uQ6C@%oVklXwbyljE-mvBol{R=K0bIBO4??&T0Sz<>r1I!6E@Ego~1o&ru
zjv|0yH*t_e9Q)Yj{^EZ%+=EGX=|VrmbS*JjSZveo8IXW7E&iMsUfla=5iOu2;Py78
z7v~ly`RM2Z@7o}5n~JPy5$maww$-Ejy+R!7K{?1iPC8bUb^6AT@D{G(irBv;tY_U@
z#pSejtGH2XWbEuS8@e=~D}+)RrL`odi<W8H<N$Nx88D74TD^Z@IV4W+l;y>bj+XMt
zRf$oFg+w}y?{ZwH;YL~Hx)iG#uGES=cb|96J4$#6xNI99|Ia~bhjqsI7VVnvqwx*`
zQ+v={aYOCKBln~657GGEe}HHnNQnkb;g>ryei4wEhiQ<UY8Dp|g0%nSo3vfZN=VRM
za|6Rpl&P7Nh7f;DcpisQq@?PrDCyIYA6V;~Z<>>)HkyvB4PDk~^_aY}He(C4D?Y1*
zO4$Sa54<FkHkqq7XL@c;+7T;k3a{LQ5Vt|{1VVfPh4Tb1p26SNlyKvE`y22`Tlx@o
zK4Q9at<ju>v@;VSC2aXW+xaX`+xH-$_I9B?ZWnn+`u=}%7`$U#v(vqhR>qZzo_mGE
z6}^!$4}G0YxkuA*HQNsb%uX?>W!Ky+#=k;r+b;-t9Bd4&x;M@_CfT4or=S(r9u1uA
zo(^_~28E~0$KqS9h!Yr%U;5e0tz=X}y0}!U<axJJugZA0B(m;li`b@*UC*Rj*ZeBi
zi>ty{VoHBxbeT97^TDLOVVG)It2gF`X?<kd3?mwt;dJ_*<y_}qS8~ub4g)$}fKGcG
z(3Nn#TAvlVq3c_0M_;6p(%XPadk3J>mtMch@=$4S11kL;fNFNu>KTr8(_nS=nQ&bM
zPCroKnyTzE(2S9hJRRbJ37(#esGyl5GruMcRT_U)lP;+wQYxKnZi)ATUR>F)){{p#
z5lT~?c=XbIJ%@P3UBUr>H;p4c<GG{Z1Yl4MFqHekorx!Vp}EqxY*T7ZZn6h<<fSTC
z-j5OF+R`?lB{C(<Cde(PC(VElO3m&!GifXsE-Z)~{iN7uT$f<licICEi5=C%hO&ek
z@dtl#DLLghXGzA5`;=@t2&H?O@~&rF4&gfs*$T_cHwAcNtDGV{h4AJo*Yd0tn61mq
zMVn1|?aG}}WcyT8GDA3K${l*Cxl^zBR7}ulwv8U?kboVY`KWCSiFe*|%$9PpLaW7a
zOuuWeL!r}#?X%q@U1-Z0xg#G`xtu$@Xn21;OCW77xSSLoeAr!0_OIDH4c1{JyX*#m
zJD~R>-!@gzXj2vAjYUvSojxG}p8}HAkqFAfYgyYc*>PnOn9h#scwnzMw(Ag^g6Vp>
zMPMIw`2dQ~(O5AvpqCB5&<rx|v%$bl%D>>f;4X<LO)t6607%Fpdx7Q?3-Y8`+1nnq
z0JmHTzVdM`-i<jATzLFnP)h>@6aWAK2mrEe7n6T&?gO%I7n5*qM-H-W7gwhCFC~Nq
z0012xlf`Z>AhK;2SB5mjouU8$0Pg?*022TJ00000000000001DZ<7;mB?eJ&00000
DbB<J{

delta 1313
zcmV++1>X9u;sL(i0S!<~0|XQR000O85OEZ-4U=dN5OEY&-!HT0lmq|(4iS^CXfS`>
zSZ!}xH5C4i#DB1iL^e&_o0q2BShA^I={mMnQE%A9$4lZS7WXB(*V$S=Q9w$I#uvI#
zg`tYJs(6_u(K6uX-}t9sA73X<c4<phHZ&<p>|^`9Job6)lgf=%-$M^b6w@%M;)0dO
zhy;zWNrP4uciGB&SMZJNZ@*PpCY^sUV(30?vbLBv-S9D5a(z<8Jo%9)M?Cq8CqM9{
z&y$~cvVIvOryV|Y0=IK3qRlF<M_q!EFc!pB+-9uvzHP^iHu2rqV#Fg6{nToNz8!%b
zVcjm~izT~Y6|gXmP~|owehf{~nIp`lo<kZ;xQ!MFZMB*3sx<PdY0gM>z*2vQt$AeF
z6@vLNVCkaz0&?8Q{iGY9CGt>&KtCfg*bc+U9;vX$b&R<Nf*NhGZbW9oRdm~TTSA8o
zzp>pJjufnWuGb}2ZRr-)u!8?O8tB|5E224VU6!4C*s0>YYzfC;gPexzky;c2W?|rZ
z7%ftt)Ym$~CY2`bPSDbr7{-6G;cf;f{|rpcxnp9Hg@=@k5HQ7cvdSbVW2Z>RTePM|
z5$A{TmaL*|16WmD&GF<ZPxg88n>b}~?tX@&w*`{tZ~zk++K11so+jGALPJOndGZZU
zzTksRJtV%rHfE~jLQjtmKIh3cPj+D8Gnmi^i<1i9eP?y<n)sTz25W!B@Lzne0Y3E*
zPxho%IdH&}7hvJF#PRH3#qp(_Dz%?8R&tJ1C`LCxzMi33YTMCr1<DcNm}s5fgOznq
z{sOuJ(?6iGuO$O$Z}GvSQD7HF3ZxOC;1^i82l$WdTtomtKQ)kgtZekOJ++6suxLwc
z^o}L=(n7gQxp_*wW^8|bOx!4kE}<N{0OmF!EESUqZtr4F=O|MtGL@B}NaoLsM_Yoa
zZ<2tK2%l%prrBxAoVME`I$g^uL3O_7Rbr}qEnB5w#+EJPc8H~hVrDe=h#)ONU};2)
zwAu8?IYy-Ymuxtx^)3yF3T}=@>XNA95AJ6u&CrlaPt9xv>uP_gki~7&R$+qMp6D$3
zpOPE`{_4Rce+ZMdWi|{pM5cVp2ipi#?LtDSB<ib?Cw%Z7A3S~o$mMA!xu9b><xv)=
z7)YFfT}(_7#QD2^d-VnNpxlbVJ(7BcRD)pNp)xl~JLQvT=fiHy=*rrE%{wPN6v|hN
zS?P4e%9kb*N^XBe-@J*9GqDRupZnoU6XHy#@Km?b%X-YSbPR($1{ZrEIRF=r;KUq2
z<2iiRk8xKWv_AolVe-C)ca0hDnfB<6)U$mm>PdO=4Sv^*am#V98f2WgKBUFwB;#aO
zBCncpD)v})X^)kcs{Ax&RBEEGatM=EYK&^)B@o@AfvA6RXQl)vxj{2-xU&A5cfDBD
zyf=lTH0Xxi7^Z5uHn!+SEgFo<M=kg$r8jt2EvL*kq`HDtEX&Sp$XMu$zU<h;08FK#
z7&H7;B7nqc6T<WokSur2vi2q1YHm~hFOWJ`lvS~I?1T#05fy%eh0$1*EMHZ60I8By
zZj1za)|D#A*(c0iV7`}b<%IPKbE!YW@Y22ppkk|kH?IE;P)h>@6aWAK2mlaq6q9dn
z?gJ2U6q8_ZM-C8i6j$Fbv*(lq000gVleKUzAP{jBSB5mjouU8$0Pg?*022TJ00000
X000000001TZIc6WB?e(`00000fo5;m

diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งบรรจุ-examination.trdp b/BMA.EHR.Report.Service/Reports/Old/คำสั่งบรรจุ-examination.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/คำสั่งบรรจุ-examination.trdp
rename to BMA.EHR.Report.Service/Reports/Old/คำสั่งบรรจุ-examination.trdp
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งบรรจุ-examinationHead.trdp b/BMA.EHR.Report.Service/Reports/Old/คำสั่งบรรจุ-examinationHead.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/คำสั่งบรรจุ-examinationHead.trdp
rename to BMA.EHR.Report.Service/Reports/Old/คำสั่งบรรจุ-examinationHead.trdp
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งย้าย-transfer.trdp b/BMA.EHR.Report.Service/Reports/Old/คำสั่งย้าย-transfer.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/คำสั่งย้าย-transfer.trdp
rename to BMA.EHR.Report.Service/Reports/Old/คำสั่งย้าย-transfer.trdp
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งย้าย-transferHead.trdp b/BMA.EHR.Report.Service/Reports/Old/คำสั่งย้าย-transferHead.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/คำสั่งย้าย-transferHead.trdp
rename to BMA.EHR.Report.Service/Reports/Old/คำสั่งย้าย-transferHead.trdp
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointment.trdp b/BMA.EHR.Report.Service/Reports/Old/คำสั่งแต่งตั้ง-appointment.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointment.trdp
rename to BMA.EHR.Report.Service/Reports/Old/คำสั่งแต่งตั้ง-appointment.trdp
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointmentHead.trdp b/BMA.EHR.Report.Service/Reports/Old/คำสั่งแต่งตั้ง-appointmentHead.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointmentHead.trdp
rename to BMA.EHR.Report.Service/Reports/Old/คำสั่งแต่งตั้ง-appointmentHead.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก23-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก23-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก23-3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-4.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-4.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก23-4.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-4.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-5.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-5.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก23-5.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-5.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-6.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-6.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก23-6.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-6.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-7.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-7.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก23-7.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-7.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-8.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-8.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก23-8.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก23-8.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก24-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก24-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก24-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก24-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก24-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก24-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก24-3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก24-3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก24-3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก25-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก25-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก25-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก25-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก25-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก25-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก25-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก25-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก25-3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก25-3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก25-3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก25-3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก25-4.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก25-4.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก25-4.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก25-4.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก26-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก26-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก26-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก26-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก26-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก26-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก26-3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก26-3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก26-3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-4.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก26-4.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก26-4.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก26-4.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก27-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก27-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก27-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก27-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก27-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก27-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก27-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก27-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก28-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก28-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก28-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก28-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก28-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก28-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก28-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก28-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก28-3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก28-3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก28-3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก28-3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก29-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก29-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก29-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก29-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก29-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก29-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก29-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก29-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก30.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก30.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก30.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก30.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก31.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก31.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก31.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก31.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก32.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก32.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก32.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก32.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก33.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก33.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก33.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก33.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-10.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-10.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-10.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-10.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-11.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-11.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-11.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-11.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-12.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-12.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-12.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-12.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-13.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-13.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-13.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-13.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-14.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-14.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-14.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-14.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-15.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-15.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-15.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-15.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-16.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-16.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-16.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-16.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-17.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-17.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-17.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-17.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-18.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-18.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-18.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-18.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-19.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-19.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-19.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-19.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-4.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-4.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-4.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-4.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-5.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-5.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-5.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-5.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-6.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-6.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-6.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-6.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-7.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-7.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-7.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-7.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-8.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-8.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-8.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-8.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก34-9.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-9.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก34-9.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก34-9.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-10.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-10.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-10.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-10.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-4.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-4.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-4.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-4.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-5.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-5.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-5.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-5.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-6.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-6.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-6.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-6.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-7.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-7.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-7.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-7.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-8.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-8.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-8.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-8.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-9.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-9.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก35-9.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก35-9.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก36-1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก36-2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก36-3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-4.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-4.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก36-4.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-4.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-5.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-5.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก36-5.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก36-5.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ1.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ1.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ1.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ1.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ10.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ10.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ10.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ10.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ11.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ11.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ11.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ11.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ2.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ2.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ2.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ2.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ3.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ3.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ3.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ3.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ4.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ4.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ4.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ4.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ5.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ5.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ5.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ5.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ6.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ6.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ6.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ6.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ7.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ7.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ7.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ7.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ8.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ8.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ8.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ8.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ9.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ9.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ9.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก59-เครื่องราชฯ9.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก7.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก7.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก7.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก7.trdp
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก8.trdp b/BMA.EHR.Report.Service/Reports/Old/ภาคผนวก8.trdp
similarity index 100%
rename from BMA.EHR.Report.Service/Reports/ภาคผนวก8.trdp
rename to BMA.EHR.Report.Service/Reports/Old/ภาคผนวก8.trdp