From 4544d6f271c33869c870d564fcec0a19803a949f Mon Sep 17 00:00:00 2001
From: xiaodaozi <xuexuande@126.com>
Date: Mon, 27 Apr 2026 17:56:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A3=80=E9=AA=8C=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=A8=A1=E7=89=88=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/reportJYA5.html | 43 ++++++++------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/templates/reportJYA5.html b/src/main/resources/templates/reportJYA5.html
index 2e59466..94b99db 100644
--- a/src/main/resources/templates/reportJYA5.html
+++ b/src/main/resources/templates/reportJYA5.html
@@ -40,29 +40,22 @@
         <tr>
             <td style="width: 33%;">
                 <span>患者电话：</span>
-                <span th:text="${baseInfo.contactsPhno}"></span>
+                <span th:text="${baseInfo.contactsPhno} ? ${#strings.substring(baseInfo.contactsPhno, 0, 3) + '***' + #strings.substring(baseInfo.contactsPhno, 7)}:''"></span>
             </td>
-            <td style="width: 66%;"
-                colspan="3">
-                <span>身份证号：</span>
-                <span th:text="${baseInfo.idno}"></span>
-            </td>
-        </tr>
-        <tr>
             <td style="width: 33%;">
-                <span>就诊来源：</span>
-                <span th:text="${baseInfo.patVisitType}"></span>
+                <span>身份证号：</span>
+                <span th:text="${baseInfo.idno} ? ${#strings.substring(baseInfo.idno, 0, 6) + '***' + #strings.substring(baseInfo.idno, 14)}:''"></span>
             </td>
             <td style="width: 33%;">
                 <span>就诊科室：</span>
                 <span th:text="${baseInfo.deptName}"></span>
             </td>
+        </tr>
+        <tr>
             <td style="width: 33%;">
                 <span>挂号单号：</span>
                 <span th:text="${baseInfo.rgstNo}"></span>
             </td>
-        </tr>
-        <tr>
             <td style="width: 33%;">
                 <span>门诊编号：</span>
                 <span th:text="${baseInfo.outpno}"></span>
@@ -71,25 +64,25 @@
                 <span>住院编号：</span>
                 <span th:text="${baseInfo.inpno}"></span>
             </td>
+        </tr>
+        <tr>
             <td style="width: 33%;">
                 <span>住院床号：</span>
                 <span th:text="${baseInfo.inpBedNo}"></span>
             </td>
+            <td style="width: 33%;">
+                <span>申请时间：</span>
+                <span th:text="${baseInfo.applyTime} ? ${#strings.substring(baseInfo.applyTime, 0, 16)}:''"></span>
+            </td>
+            <td style="width: 33%;">
+                <span>检验时间：</span>
+                <span th:text="${baseInfo.examTime} ? ${#strings.substring(baseInfo.examTime, 0, 16)}:''"></span>
+            </td>
         </tr>
         <tr>
-            <td style="width: 33%;">
-                <div>申请时间：</div>
-                <div style="padding-top: 3px;"
-                     th:text="${baseInfo.applyTime}"></div>
-            </td>
-            <td style="width: 33%;">
-                <div>检验时间：</div>
-                <div style="padding-top: 3px;"
-                     th:text="${baseInfo.examTime}"></div>
-            </td>
-            <td style="width: 33%; ">
-                <span>申请项目：</span>
-                <span th:text="${baseInfo.citemContent}"></span>
+            <td colspan="3">
+                <span style="">申请项目：</span>
+                <span th:text="${baseInfo.citemContent}" />
             </td>
         </tr>
     </table>