From 73f860eee8d8faf9808126de214e9fc30f1cbd40 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 08 五月 2025 16:54:41 +0800
Subject: [PATCH] zjh20250508

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 36f0a9f..dc43449 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -3112,11 +3112,10 @@
                                 String bgNr = jcbgd.getBgNr();
                                 // 姝e垯琛ㄨ揪寮忥細鍖归厤鏁板瓧鍚庤窡 '.' 鎴� '銆�'
                                 String regex = "\\d+[\\.,銆乚";
-//                                String regex = "(?<=\\d+)([\\.,銆乚)";
                                 // 浣跨敤姝e垯鏇挎崲锛屽尮閰嶇殑鏁板瓧鍚庢坊鍔犳崲琛岀
-                                yxbx = yxbx.replaceAll(regex, "\n$0");
-//                                bgNr = bgNr.replaceAll(regex, "\n$0");
-
+                                if(StringUtil.isNotBlank(yxbx)) yxbx = yxbx.replaceAll(regex, "\n$0");
+                                if(StringUtil.isBlank(bgNr)) bgNr = "";
+                                if(StringUtil.isBlank(yxbx)) yxbx = "";
                                 tjPdfVO.setTs(yxbx);
                                 tjPdfVO.setSj(bgNr);
                                 tjPdfVO.setShys(jcbgd.getShysxm());

--
Gitblit v1.8.0