From 582354e83e6dbd0ebfc09918428b3858eb34efbb Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 19 Dec 2023 09:31:25 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=9F?= =?UTF-8?q?=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=A5=E0=B8=B2=5Fdefect#197?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LeaveReportController.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs index ae70d2f1..7cd19252 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs @@ -72,7 +72,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave9", - reportName = $"แบบใบลาป่วย ลาคลอดบุตร ลากิจส่วนตัว_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -117,7 +117,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave10", - reportName = $"แบบใบลาไปช่วยเหลือภริยาที่คลอดบุตร_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -161,7 +161,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave11", - reportName = $"แบบใบลาพักผ่อน_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -209,7 +209,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave13", - reportName = $"แบบใบลาไปประกอบพิธีฮัจย์ ณ เมืองเมกกะ ประเทศซาอุดิอาระเบีย_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -237,7 +237,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave12", - reportName = $"แบบใบลาอุปสมบท_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -290,7 +290,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave14", - reportName = $"แบบใบลาเข้ารับการตรวจเลือก หรือเข้ารับการเตรียมพล_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -338,7 +338,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave15", - reportName = $"แบบใบลาไปศึกษา ฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -393,7 +393,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave16", - reportName = $"แบบใบลาไปปฏิบัติงานในองค์การระหว่างประเทศ_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -435,7 +435,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave17", - reportName = $"แบบใบลาติดตามคู่สมรส_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -490,7 +490,7 @@ namespace BMA.EHR.Leave.Service.Controllers return new { template = "leave18", - reportName = $"แบบใบลาไปฟื้นฟูสมรรถภาพด้านอาชีพ_{fullName}", + reportName = $"leave_form", data = new { leaveWrote = data.LeaveWrote ?? "", @@ -606,7 +606,7 @@ namespace BMA.EHR.Leave.Service.Controllers var result = new { template = "แบบใบขอยกเลิกวันลา", - reportName = $"แบบใบขอยกเลิกวันลา_{fullName}", + reportName = $"leave_cancel_form", data = new { leaveWrote = data.CancelLeaveWrote ?? "",