From b2f2e8cd49ef1d18dfd5330de7136492f97c80fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=A4=B4=E4=BA=BA?= <3076767823@qq.com> Date: Tue, 25 Mar 2025 21:00:46 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=97=A8?= =?UTF-8?q?=E8=AF=8A=E7=BC=B4=E8=B4=B9=E6=A8=A1=E6=9D=BF-T2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../print/enums/ReceiptTemplateEnum.java | 6 +- .../service/impl/RegisterServiceImpl.java | 24 ++++---- src/main/resources/templates/department.html | 60 +++++++++++++++++++ 3 files changed, 78 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/templates/department.html diff --git a/src/main/java/com/dpkj/modules/print/enums/ReceiptTemplateEnum.java b/src/main/java/com/dpkj/modules/print/enums/ReceiptTemplateEnum.java index 46788e5..85f71ba 100644 --- a/src/main/java/com/dpkj/modules/print/enums/ReceiptTemplateEnum.java +++ b/src/main/java/com/dpkj/modules/print/enums/ReceiptTemplateEnum.java @@ -20,8 +20,12 @@ public enum ReceiptTemplateEnum { /** * 门诊缴费的模板 */ - OUTPATIENT_PAYMENT("3", "outpatientPayment", "门诊缴费的小票"), + OUTPATIENT_T1("3", "outpatientPayment", "门诊缴费的小票-T1"), + /** + * 门诊缴费的模板 + */ + OUTPATIENT_T2("4", "department", "门诊缴费的小票-T2"), ; diff --git a/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java b/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java index 86a048a..14f4a00 100644 --- a/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java +++ b/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java @@ -83,7 +83,7 @@ public class RegisterServiceImpl implements PrintService { } } catch (IOException e) { - log.error(""); + log.error("图片分段错误"); e.printStackTrace(); } }else { @@ -101,24 +101,26 @@ public class RegisterServiceImpl implements PrintService { param.put("alignment", 0); // 对齐方式 param.put("offsetX", 0); // x param.put("offsetY", 0); // y - param.put("resolution", 8); // 1\2\4\6\8打印的清晰度 + param.put("resolution", 1); // 1\2\4\6\8打印的清晰度 param.put("mediaCtrl", 1); // 媒介类型，当前为：打印缓冲区 + 弹出 + 剪纸 param.put("fields", StringUtils.join(filePathList, "&")); lexMarkDTO.setParam(param.toJSONString()); LexMarkResultDTO paramLexMarkResultDTO = thirdService.callDevice(lexMarkDTO, LexMarkResultDTO.Param.class); for (String path : deletePathList) { - File file = new File(path); - // 检查文件是否存在 - if (file.exists() ) { - // 尝试删除文件 - if (file.delete()) { - log.info("文件删除成功: " + path); + if ( path != null && !path.isEmpty()) { + File file = new File(path); + // 检查文件是否存在 + if (file.exists()) { + // 尝试删除文件 + if (file.delete()) { + log.info("文件删除成功: " + path); + } else { + log.info("文件删除失败: " + path); + } } else { - log.info("文件删除失败: " + path); + log.info("文件不存在: " + path); } - } else { - log.info("文件不存在: " + path); } } diff --git a/src/main/resources/templates/department.html b/src/main/resources/templates/department.html new file mode 100644 index 0000000..cd9209f --- /dev/null +++ b/src/main/resources/templates/department.html @@ -0,0 +1,60 @@ + + + + + 门诊缴费凭证 + + +
+
+
************
+
+
+
+
-----------------------------------------------------------------------------
+
+
+ 姓名： + 性别： + 年龄： +
+
门诊号：
+
就诊医生：
+
就诊科室：
+
+
-----------------------------------------------------------------------------
+
+
费用总额： 个人支付：
+
实收金额：
+
实收金额：
+
+
-----------------------------------------------------------------------------
+
+ + + + + + + + + + + + + +
项目名称数量单价小计
+
+
-----------------------------------------------------------------------------
+
+
终端编号：
+
打印时间：
+
+
+ 温馨提示
+ 1.请取走全部凭条、并妥善保管
+ 2.如果对缴费结算存在疑问，请到人工窗口咨询 +
+
+ +