From ec266a0440669bb6b9830991770fa5b0a7568fdf Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 13 十二月 2024 15:44:55 +0800
Subject: [PATCH] 20241213
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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..c019590 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 (dictComp == null) {
+ hashMap.put("work", "鏃�");
+ } else {
+ hashMap.put("work", dictComp.getCnName());
+ }
}
hashMap.put("sex", sex);
hashMap.put("tjnumber", tjNumber);
--
Gitblit v1.8.0