From e4b5fef59ea127c76f46ba785c19e9da46c9514d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 16 十二月 2024 18:12:13 +0800
Subject: [PATCH] zjh202412016
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 80 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 29 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 77f58aa..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
@@ -856,7 +856,7 @@
return AjaxResult.success();
}
- public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate) throws Exception {
+ public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
pdfPage = 0;
DictHosp dictHosp = dictHospService.list().get(0);
String color = sysConfigService.selectConfigByKey("report_title_color");
@@ -1343,15 +1343,23 @@
cell.setPhrase(new Phrase("鎬绘鍖诲笀:", zongJianTitleFont));
tableQz.addCell(cell);
+
cell = new PdfPCell();
cell.setBorder(Rectangle.NO_BORDER);
cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
cell.setHorizontalAlignment(Element.ALIGN_CENTER);
cell.setPaddingTop(10);
cell.setPaddingBottom(10);
- cell.setPhrase(new Phrase(sysConfigService.selectConfigByKey("pdf_report_zongjianysname"), zongJianFont));
-// cell.setPhrase(new Phrase(tjOrder.getCheckDoctor(), zongJianFont));
- tableQz.addCell(cell);
+ if (zongJianYiShiQianMing == null) {
+ cell.setPhrase(new Phrase(sysConfigService.selectConfigByKey("pdf_report_zongjianysname"), zongJianFont));
+ tableQz.addCell(cell);
+ }else {
+ byte[] bytes = Base64.getDecoder().decode(zongJianYiShiQianMing.getTemplate());
+ Image image = Image.getInstance(bytes);
+ image.scaleToFit(100, 100);
+ cell.addElement(image);
+ tableQz.addCell(cell);
+ }
cell = new PdfPCell();
cell.setBorder(Rectangle.NO_BORDER);
@@ -1424,9 +1432,7 @@
// 棣栭〉琛ㄥ崟
String tjNumber = tjOrder.getTjNumber();
String template = tjReportTemplate.getTemplate();
- LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
- DictComp dictComp = dictCompService.getOne(wq111);
+
LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
@@ -1461,10 +1467,18 @@
tjtype = "涓汉";
hashMap.put("tjtype", tjtype);
}
- if (dictComp == null) {
- hashMap.put("work", "鏃�");
- } else {
- hashMap.put("work", dictComp.getCnName());
+ 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);
+
+ if (StrUtil.isBlank(tjOrder.getFirmName())) {
+ hashMap.put("work", "鏃�");
+ } else {
+ hashMap.put("work", tjOrder.getFirmName());
+ }
}
hashMap.put("sex", sex);
hashMap.put("tjnumber", tjNumber);
@@ -1889,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);
@@ -1948,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);
@@ -2071,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);
@@ -2131,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);
@@ -2549,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());
@@ -2597,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