From f20eab3d08011a159e728f5dbfd3197b8ba84d09 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 17 十二月 2024 14:13:00 +0800
Subject: [PATCH] zjh202412017
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 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 c019590..6a98da7 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
@@ -1470,14 +1470,14 @@
if (StrUtil.isNotBlank(customer.getCompName())){
hashMap.put("work", customer.getCompName());
}else {
- LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
- DictComp dictComp = dictCompService.getOne(wq111);
+// LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
+// wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
+// DictComp dictComp = dictCompService.getOne(wq111);
- if (dictComp == null) {
+ if (StrUtil.isBlank(tjOrder.getFirmName())) {
hashMap.put("work", "鏃�");
} else {
- hashMap.put("work", dictComp.getCnName());
+ hashMap.put("work", tjOrder.getFirmName());
}
}
hashMap.put("sex", sex);
@@ -1903,10 +1903,12 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
- ppp = new Paragraph("缁撹锛�"+entry.getKey().getRemark(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+ if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
}else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -1962,10 +1964,12 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
- ppp = new Paragraph("缁撹锛�"+entry.getKey().getRemark(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+ if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
}else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2085,10 +2089,12 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
- ppp = new Paragraph("缁撹锛�"+entry.getKey().getRemark(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+ if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
}else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2145,10 +2151,12 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
- ppp = new Paragraph("缁撹锛�"+entry.getKey().getRemark(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+ if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
}else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2563,7 +2571,7 @@
if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
tjOrderDetail.setProject(tjProject);
- if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
+ if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId()) && entry.getKey().getType() == 1) {
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -2611,7 +2619,7 @@
if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
tjOrderDetail.setProject(tjProject);
- if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
+ if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId()) && entry.getKey().getType() == 1) {
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
--
Gitblit v1.8.0