From 09407c70c73390f8c934ca0f90697ca99aa16f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E6=96=87=E8=B4=A2?= <qq1975965567@163.com>
Date: Wed, 18 Jun 2025 18:41:14 +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

---
 src/main/resources/templates/department.html  | 27 +++++++++----------
 .../resources/templates/hospitalPayment.html  | 26 +++++++++---------
 .../templates/outpatientPayment.html          |  6 ++---
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/templates/department.html b/src/main/resources/templates/department.html
index 9f51c40..aef7988 100644
--- a/src/main/resources/templates/department.html
+++ b/src/main/resources/templates/department.html
@@ -34,21 +34,18 @@
     </div>
     <div style="border-bottom: 1px dashed #000;margin: 3px 0;"></div>
     <div style="font-size: 35px; 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="margin-top: 10px;word-break: break-all;">费用总额：<span th:text="${totalFee}"></span>元</div>
+        <div style="margin-top: 10px;word-break: break-all;">个人自费：<span th:text="${personalPayment}"></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="${yyyh}"></span>元</div>
+            <div style="margin-top: 10px;word-break: break-all;">医院账户支付：<span th:text="${yyzh}"></span>元</div>
         </div>
-        <div style="margin-top: 10px;word-break: break-all;" th:if="${chs==1}">
-            <span style="margin-right: 25px;">医保统筹基金：<span th:text="${ybtcjj}"></span>元</span>
-            <span>个人医保账户：<span th:text="${ybgrzh}"></span>元</span>
-        </div>
-        <div style="margin-top: 10px;word-break: break-all;" th:if="${chs==1}">
-            <span style="margin-right: 25px;">医院优惠金额：<span th:text="${yyyh}"></span>元</span>
-            <span>医院账户支付：<span th:text="${yyzh}"></span>元</span>
+        <div style="margin-top: 10px;word-break: break-all;">实收金额：<span th:text="${actualReceiptAmount}"></span>元
         </div>
         <div style="margin-top: 10px;word-break: break-all;">实收金额：<span
-                th:text="${actualReceiptAmount}"></span>元</div>
-        <div style="margin-top: 10px;">实收金额：<span th:text="${actualReceiptAmountChinese}"></span></div>
+                th:text="${actualReceiptAmountChinese}"></span></div>
     </div>
     <div style="border-bottom: 1px dashed #000;margin: 3px 0;"></div>
     <div style="margin: 10px 20px">
@@ -68,8 +65,10 @@
         </table>
     </div>
     <div style="border-bottom: 1px dashed #000;margin-bottom: 3px;"></div>
-    <div style="margin-left: 20px;font-size: 36px;word-break: break-all;">终端编号：<span th:text="${terminalNumber}"></span></div>
-    <div style="margin-left: 20px;font-size: 36px;word-break: break-all;">打印时间：<span th:text="${printTime}"></span></div>
+    <div style="margin-left: 20px;font-size: 36px;word-break: break-all;">终端编号：<span
+            th:text="${terminalNumber}"></span></div>
+    <div style="margin-left: 20px;font-size: 36px;word-break: break-all;">打印时间：<span th:text="${printTime}"></span>
+    </div>
     <div style="margin-left: 20px;font-size: 36px;word-break: break-all;">
         <span>温馨提示：请取走缴费凭证，并妥善保管。如果对缴费存在疑问，请到人工窗口咨询！</span>
     </div>
diff --git a/src/main/resources/templates/hospitalPayment.html b/src/main/resources/templates/hospitalPayment.html
index 254097e..3891118 100644
--- a/src/main/resources/templates/hospitalPayment.html
+++ b/src/main/resources/templates/hospitalPayment.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-    <title>挂号单</title>
+    <title>住院押金预缴</title>
 </head>
 <body>
 <div style="font-size: 32px;font-weight: bold;">
@@ -16,21 +16,21 @@
         <div style="border-bottom: 1px dashed #000;margin: 3px 0;"></div>
     </div>
     <div style=" font-size: 37px;">
-        <div style="margin-left: 35px;">姓&emsp;&emsp;名：<span th:text="${name}"></span></div>
-        <div style="margin-left: 35px;">性&emsp;&emsp;别：<span th:text="${gender}"></span></div>
-        <div style="margin-left: 35px;">年&emsp;&emsp;龄：<span th:text="${age}"></span></div>
-        <div style="margin-left: 35px;">出生日期：<span th:text="${birthDate}"></span></div>
-        <div style="margin-left: 35px;">门&ensp;诊&ensp;号：<span th:text="${outpatientNumber}"></span></div>
-        <div style="margin-left: 35px;">入院科室：<span th:text="${department}"></span></div>
-        <div style="margin-left: 35px;">总&ensp;费&ensp;用：<span th:text="${totalFee}"></span>&thinsp;元</div>
-        <div style="margin-left: 35px;">支付方式：<span th:text="${paymentMethod}"></span></div>
-        <div style="margin-left: 35px;">交易流水：<span style="font-size: 35px;" th:text="${transactionNumber}"></span>
+        <div style="margin-left: 20px;">姓&emsp;&emsp;名：<span th:text="${name}"></span></div>
+        <div style="margin-left: 20px;">性&emsp;&emsp;别：<span th:text="${gender}"></span></div>
+        <div style="margin-left: 20px;">年&emsp;&emsp;龄：<span th:text="${age}"></span></div>
+        <div style="margin-left: 20px;">出生日期：<span th:text="${birthDate}"></span></div>
+        <div style="margin-left: 20px;">门&ensp;诊&ensp;号：<span th:text="${outpatientNumber}"></span></div>
+        <div style="margin-left: 20px;">入院科室：<span th:text="${department}"></span></div>
+        <div style="margin-left: 20px;">总&ensp;费&ensp;用：<span th:text="${totalFee}"></span>&thinsp;元</div>
+        <div style="margin-left: 20px;">支付方式：<span th:text="${paymentMethod}"></span></div>
+        <div style="margin-left: 20px;">交易流水：<span style="font-size: 35px;" th:text="${transactionNumber}"></span>
         </div>
     </div>
     <div style="border-bottom: 1px dashed #000;margin-bottom: 3px;"></div>
-    <div style="margin-left: 35px;font-size: 36px;">终端编号：<span th:text="${terminalNumber}"></span></div>
-    <div style="margin-left: 35px;font-size: 36px;">打印时间：<span th:text="${printTime}"></span></div>
-    <div style="margin-left: 35px;font-size: 36px;margin-top: 10px;">
+    <div style="margin-left: 20px;font-size: 36px;">终端编号：<span th:text="${terminalNumber}"></span></div>
+    <div style="margin-left: 20px;font-size: 36px;">打印时间：<span th:text="${printTime}"></span></div>
+    <div style="margin-left: 20px;font-size: 36px;">
         <span>温馨提示：请取走缴费凭证，并妥善保管。如果对缴费存在疑问，请到人工窗口咨询！</span>
     </div>
 </div>
diff --git a/src/main/resources/templates/outpatientPayment.html b/src/main/resources/templates/outpatientPayment.html
index ea06a68..541e350 100644
--- a/src/main/resources/templates/outpatientPayment.html
+++ b/src/main/resources/templates/outpatientPayment.html
@@ -26,9 +26,9 @@
         </div>
     </div>
     <div style="border-bottom: 1px dashed #000;margin-bottom: 3px;"></div>
-    <div style="margin-left: 35px;font-size: 36px;">终端编号：<span th:text="${terminalNumber}"></span></div>
-    <div style="margin-left: 35px;font-size: 36px;">打印时间：<span th:text="${printTime}"></span></div>
-    <div style="margin-left: 35px;font-size: 36px;margin-top: 10px;">
+    <div style="margin-left: 20px;font-size: 36px;">终端编号：<span th:text="${terminalNumber}"></span></div>
+    <div style="margin-left: 20px;font-size: 36px;">打印时间：<span th:text="${printTime}"></span></div>
+    <div style="margin-left: 20px;font-size: 36px;">
         <span>温馨提示：请取走缴费凭证，并妥善保管。如果对缴费存在疑问，请到人工窗口咨询！</span>
     </div>
 </div>