From 9a7ee34013ff0a0eb9a65d76ced42b4f13f3e4d4 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期四, 13 三月 2025 17:39:22 +0800 Subject: [PATCH] 从lis、pacs视图查询增加携带院区 修改签到登记价格问题 --- ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 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 dede3db..3be6b35 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 @@ -1050,9 +1050,10 @@ xmXh++; } } - }else { + } + /* else { - if (!collect.isEmpty() && !map.isEmpty()){ + if (!collect.isEmpty() || !map.isEmpty()){ paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細"); paragraph.setSpacingBefore(3f); paragraph.setSpacingAfter(2f); @@ -1146,7 +1147,7 @@ } } } - } + } */ @@ -1390,9 +1391,10 @@ } } }*/ - } else { + } + /* else { - if (!collect.isEmpty() && !map.isEmpty()){ + if (!collect.isEmpty() || !map.isEmpty()){ paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�"); paragraph.setSpacingBefore(3f); paragraph.setSpacingAfter(2f); @@ -1536,7 +1538,7 @@ } } } - } + } */ for (int i = 0; i < 1; i++) { paragraph = PdfUtils.setParagraph(defaultFont, ""); -- Gitblit v1.8.0