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
                         };