From 014e8cb26046a31ae24c37c50747e2fcd280c0e3 Mon Sep 17 00:00:00 2001 From: xiaodaozi Date: Thu, 13 Nov 2025 18:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E6=94=B9A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dpkj/modules/print/controller/MS439Controller.java | 1 + .../modules/print/service/impl/MS439PrintServiceImpl.java | 3 +-- src/main/resources/templates/reportJYA5.html | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dpkj/modules/print/controller/MS439Controller.java b/src/main/java/com/dpkj/modules/print/controller/MS439Controller.java index a9aa99b..cee24bb 100644 --- a/src/main/java/com/dpkj/modules/print/controller/MS439Controller.java +++ b/src/main/java/com/dpkj/modules/print/controller/MS439Controller.java @@ -41,6 +41,7 @@ public class MS439Controller { // 获取检验报告PDF String path = ms439PrintService.getJYPDFPath(params); MS439Request ms439Request = new MS439Request(); + ms439Request.setPagesource(params.getString("pagesource")); ms439Request.setFileDir(path); LexMarkResultDTO result = ms439PrintService.printImage(ms439Request); return Result.ok(result); diff --git a/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java b/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java index f1b3b02..f02cc6e 100644 --- a/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java +++ b/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java @@ -224,7 +224,7 @@ public class MS439PrintServiceImpl implements MS439PrintService { // 2. 准备模板数据 Map data = prepareReportData(params); // 3. 渲染Thymeleaf模板 - String htmlContent = TemplateUtil.renderThymeleafTemplate(data, "reportJY"); + String htmlContent = TemplateUtil.renderThymeleafTemplate(data, StrUtil.equals("A5", params.getString("pagesource")) ? "reportJYA5" : "reportJY"); // 4. 生成PDF文件 TemplateUtil.createPdfFromHtml(htmlContent, pdfPath); @@ -256,7 +256,6 @@ public class MS439PrintServiceImpl implements MS439PrintService { } - // 报告数据准备（根据实际业务实现） public static Map prepareReportData(JSONObject params) { Map data = new HashMap<>(); diff --git a/src/main/resources/templates/reportJYA5.html b/src/main/resources/templates/reportJYA5.html index e449172..2e59466 100644 --- a/src/main/resources/templates/reportJYA5.html +++ b/src/main/resources/templates/reportJYA5.html @@ -5,10 +5,10 @@ 检验报告单 -
+
-
+
澜沧拉祜族自治县中医医院检验单
@@ -19,7 +19,7 @@
- +
@@ -98,7 +98,7 @@
- +
项目名称