From 50b3dde54e5907569861fba93746ad1f774505e0 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Tue, 21 Jan 2025 18:10:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=81?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=9C=E0=B8=A5=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=20(18)?=
 =?UTF-8?q?=20#1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Repositories/Reports/ProbationReportRepository.cs         | 2 +-
 .../Controllers/ProbationReportController.cs                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
index 46433515..88390358 100644
--- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
@@ -952,7 +952,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                         CommanderPosition = string.IsNullOrEmpty(evaluate_assign.result.commander.Position) ? string.Empty : evaluate_assign.result.commander.Position,
                         CommanderDate = string.IsNullOrEmpty(evaluate_assign.result.evaluate.director1_dated.ToString()) ? "-" : evaluate_assign.result.evaluate.director1_dated.ToThaiFullDate().ToString().ToThaiNumber(),
                         Name = evaluate_assign.result.experimentee.name,
-                        RoundNo = evaluate_assign.result.assign.round_no.ToString().ToThaiNumber(),
+                        RoundNo = no.ToString().ToThaiNumber(),
                         DateStart = evaluate_assign.result.assign.date_start != string.Empty ? dateStart_ : "-",
                         DateFinish = evaluate_assign.result.assign.date_finish != string.Empty ? dateFinish_ : "-",
                         Develop1 = developComplete1,
diff --git a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs
index de66404d..0a93a1ed 100644
--- a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs
@@ -1131,10 +1131,10 @@ namespace BMA.EHR.Report.Service.Controllers
                         //ReportProcessor reportProcessor = new ReportProcessor(_configuration);
                         //RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
                         //return File(result.DocumentBytes, mimeType, $"แบบรายงานการประเมินผล.{exportType.Trim().ToLower()}");
-                        var ExpandMonth = evaluateAssign.GetType().GetProperty("ExpandMonth").GetValue(evaluateAssign).ToString();
+
                         var data = new
                         {
-                            template = ExpandMonth == "๐" ? "probation-18-1" : "probation-18-2",
+                            template = no == 1 ? "probation-18-1" : "probation-18-2",
                             reportName = "docx-report",
                             data = evaluateAssign
                         };