From 18f74eb3426d142229c233ca0c653b0fca8473ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E6=96=87=E8=B4=A2?= <qq1975965567@163.com>
Date: Fri, 20 Jun 2025 10:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A5=A8=E6=A8=A1=E6=9D=BF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReceiptPrintController.java    |  2 +-
 src/main/resources/application-pro.yml        |  2 +-
 src/main/resources/templates/department.html  | 38 +++++++++++--------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/dpkj/modules/autoReplyPrint/controller/ReceiptPrintController.java b/src/main/java/com/dpkj/modules/autoReplyPrint/controller/ReceiptPrintController.java
index 4ef2e25..dbc8b36 100644
--- a/src/main/java/com/dpkj/modules/autoReplyPrint/controller/ReceiptPrintController.java
+++ b/src/main/java/com/dpkj/modules/autoReplyPrint/controller/ReceiptPrintController.java
@@ -75,7 +75,7 @@ public class ReceiptPrintController {
         int dinyHeight = 0;
         if (templateName.equals("department")) {
             // 由于是使用的门诊小票-T2，那么默认的高度为1100，强行设置，通过动态修改渲染的图片的高度
-            height = 800;//根据实际情况800较为合适
+            height = 900;//根据实际情况调整
 
             // 单行最大长度为10
             int singleLineMaxLength = 10;
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index f51dd11..7be05ab 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,6 +1,6 @@
 dpkj:
   #后端项目访问地址 #https://yinyitong.yzqingyan.cn/  http://172.16.11.13:15946/  ttps://yinyitong.yzqingyan.cn
-  serverurl: http://localhost:5946/api/
+  serverurl: http://www.lczyyy.com/api/
   # 医保配置
   chs:
     # 医保机构编码
diff --git a/src/main/resources/templates/department.html b/src/main/resources/templates/department.html
index 20b0d07..077719b 100644
--- a/src/main/resources/templates/department.html
+++ b/src/main/resources/templates/department.html
@@ -18,35 +18,43 @@
         <div style="border-bottom: 1px dashed #000;margin: 3px 0;"></div>
     </div>
     <div style="font-size: 29px;word-break: break-all;margin: 10px 20px;">
-        <div style="display: flex;">
+        <div style="margin-top: 10px;word-break: break-all;" th:if="${outpatientNumber}">门诊号：<span
+                th:text="${outpatientNumber}"></span>
+        </div>
+        <div style="margin-top: 10px;word-break: break-all;">
             <span style="margin-right: 25px;">姓名：<span th:text="${name}"></span></span>
             <span style="margin-right: 25px;">性别：<span th:text="${gender}"></span></span>
             <span>年龄：<span th:text="${age}"></span></span>
         </div>
-        <div style="word-break: break-all;margin-top: 10px;">
-            <span style="margin-right: 25px;" th:if="${outpatientNumber}">
-                门诊号：<span th:text="${outpatientNumber}"></span></span>
-            <span th:if="${doctor}">
-                就诊医生：<span th:text="${doctor}"></span>
-            </span>
+        <div style="margin-top: 10px;word-break: break-all;" th:if="${doctor}">
+            就诊医生：<span th:text="${doctor}"></span>
         </div>
-        <div style="margin-top: 10px;" th:if="${department}">就诊科室：<span th:text="${department}"></span>
+        <div style="margin-top: 10px;word-break: break-all;" th:if="${department}">就诊科室：<span
+                th:text="${department}"></span>
         </div>
     </div>
     <div style="border-bottom: 1px dashed #000;margin: 3px 0;"></div>
     <div style="font-size: 29px; margin: 10px 20px">
-        <div style="word-break: break-all;">
-            <span style="margin-right: 25px;">费用总额：<span th:text="${totalFee}"></span></span>
-            <span>个人支付：<span th:text="${personalPayment}"></span></span>
+        <div style="text-align: center; font-size: 40px;font-weight: bold;"><span>费用信息</span></div>
+        <div style="margin-top: 10px;">
+            <div style="float: left;width: 190px;">金额合计：</div>
+            <div style="margin-left: 190px;word-break: break-all;">
+                <span>￥<span th:text="${totalFee}"></span>（小写金额）</span><br/>
+                <span><span th:text="${actualReceiptAmountChinese}"></span>（大写金额）</span>
+            </div>
         </div>
-        <div style="margin-top: 10px;word-break: break-all;"><span>实收金额：</span><span
-                th:text="${actualReceiptAmount}"></span></div>
-        <div style="margin-top: 10px;"><span>实收金额：</span><span th:text="${actualReceiptAmountChinese}"></span></div>
+        <div th:if="${chs==1}">
+            <div style="margin-top: 10px;word-break: break-all;">医保统筹支付：<span th:text="${ybtcjj}"></span></div>
+            <div style="margin-top: 10px;word-break: break-all;">个人医保支付：<span th:text="${ybgrzh}"></span></div>
+            <div style="margin-top: 10px;word-break: break-all;">医院账户支付：<span th:text="${yyzh}"></span></div>
+            <div style="margin-top: 10px;word-break: break-all;">医院优惠金额：<span th:text="${yyyh}"></span></div>
+        </div>
+        <div style="margin-top: 10px;word-break: break-all;">个人自费：<span th:text="${personalPayment}"></span></div>
     </div>
     <div style="border-bottom: 1px dashed #000;margin: 3px 0;"></div>
     <div style="margin: 10px 20px">
         <table style="width: 100%; table-layout: fixed; border-collapse: collapse;">
-            <tr style="font-size: 29px;">
+            <tr style="font-size: 26px;">
                 <th style="width: 300px;text-align: left;">项目名称</th>
                 <th style="width: calc(25% - 5px);text-align: center;">数量</th>
                 <th style="width: calc(25% - 5px);text-align: center;">单价</th>