From d4e4923bb6850581a18ee9a18178b82512143eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E6=96=87=E8=B4=A2?= Date: Mon, 26 May 2025 15:49:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A5=A8=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=A8=A1=E6=9D=BF=EF=BC=8C=E8=B0=83=E6=95=B4=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dpkj/common/utils/TemplateUtils.java | 4 ++-- .../com/dpkj/modules/print/request/ReceiptPrintRequest.java | 2 +- src/main/resources/templates/department.html | 2 +- src/main/resources/templates/hospitalPayment.html | 2 +- src/main/resources/templates/outpatientPayment.html | 2 +- src/main/resources/templates/register.html | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dpkj/common/utils/TemplateUtils.java b/src/main/java/com/dpkj/common/utils/TemplateUtils.java index 7e90a6e..c706121 100644 --- a/src/main/java/com/dpkj/common/utils/TemplateUtils.java +++ b/src/main/java/com/dpkj/common/utils/TemplateUtils.java @@ -147,8 +147,8 @@ public class TemplateUtils { String[] split = key.split("_"); if (split.length > 1 && split[1].equals("2base64Type")) { int type = split.length > 2 ? Integer.parseInt(split[2]) : 1; - int width = split.length > 2 ? Integer.parseInt(split[3]) : 100; - int height = split.length > 3 ? Integer.parseInt(split[4]) : 100; + int width = split.length > 2 ? (Integer.parseInt(split[3]) + 50) : 150;// 台式的二维码宽高需要比壁挂的多加50 + int height = split.length > 3 ? (Integer.parseInt(split[4]) + 50) : 150;// 台式的二维码宽高需要比壁挂的多加50 // 如果是图片类型,需要进行base64转换 String base64 = this.generateQRCode(type, String.valueOf(data.get(key)), width, height); context.setVariable(split[0], "data:image/jpeg;base64," + base64); diff --git a/src/main/java/com/dpkj/modules/print/request/ReceiptPrintRequest.java b/src/main/java/com/dpkj/modules/print/request/ReceiptPrintRequest.java index 3ccf4db..e7ec497 100644 --- a/src/main/java/com/dpkj/modules/print/request/ReceiptPrintRequest.java +++ b/src/main/java/com/dpkj/modules/print/request/ReceiptPrintRequest.java @@ -53,7 +53,7 @@ public class ReceiptPrintRequest implements Serializable { /** * 生成的模板的高度，默认为：1200 */ - private Integer height = 1200; + private Integer height = 1250; } diff --git a/src/main/resources/templates/department.html b/src/main/resources/templates/department.html index 33c31d5..86852f7 100644 --- a/src/main/resources/templates/department.html +++ b/src/main/resources/templates/department.html @@ -66,7 +66,7 @@
终端编号：
打印时间：
- 温馨提示：请取走缴费凭证，并妥善保管。
如果对缴费存在疑问，请到人工窗口咨询！ + 温馨提示：请取走缴费凭证，并妥善保管。如果对缴费存在疑问，请到人工窗口咨询！
diff --git a/src/main/resources/templates/hospitalPayment.html b/src/main/resources/templates/hospitalPayment.html index 9e0a6c2..254097e 100644 --- a/src/main/resources/templates/hospitalPayment.html +++ b/src/main/resources/templates/hospitalPayment.html @@ -31,7 +31,7 @@
终端编号：
打印时间：
- 温馨提示：请取走缴费凭证，并妥善保管。
如果对缴费存在疑问，请到人工窗口咨询！ + 温馨提示：请取走缴费凭证，并妥善保管。如果对缴费存在疑问，请到人工窗口咨询！
diff --git a/src/main/resources/templates/outpatientPayment.html b/src/main/resources/templates/outpatientPayment.html index 92726f4..ea06a68 100644 --- a/src/main/resources/templates/outpatientPayment.html +++ b/src/main/resources/templates/outpatientPayment.html @@ -29,7 +29,7 @@
终端编号：
打印时间：
- 温馨提示：请取走缴费凭证，并妥善保管。
如果对缴费存在疑问，请到人工窗口咨询！ + 温馨提示：请取走缴费凭证，并妥善保管。如果对缴费存在疑问，请到人工窗口咨询！
diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index ef12e3f..794d882 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -39,7 +39,7 @@
终端编号：
打印时间：
- 温馨提示：请取走挂号凭证，并妥善保管。
如果对缴费存在疑问，请到人工窗口咨询！ + 温馨提示：请取走挂号凭证，并妥善保管。如果对缴费存在疑问，请到人工窗口咨询！