From d0623bb91eb2eb225f459844cb6e2369afa02336 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 四月 2025 17:09:39 +0800
Subject: [PATCH] 调整检查显示
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 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 5ad75ef..7d6e3c4 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
@@ -2272,18 +2272,22 @@
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
if (isPacs) {
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ Paragraph pp;
+ Paragraph ppp;
+ if (StrUtil.isNotBlank(value.get(0).getSj())) {
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ document1.add(pp);
+ ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細"+value.get(0).getTs());
document1.add(pp);
- Paragraph ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
- pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
- document1.add(pp);
- ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+// ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
} else {
if (value.get(0).getPid().equals("1862852701533012001")) {
remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2457,18 +2461,22 @@
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
if (isPacs) {
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ Paragraph pp;
+ Paragraph ppp;
+ if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ document1.add(pp);
+ ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細"+ (value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()));
document1.add(pp);
- Paragraph ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
- pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
- document1.add(pp);
- ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+// ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
} else {
if (value.get(0).getPid().equals("1862852701533012001")) {
remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
--
Gitblit v1.8.0