From 9017efdeaa64c6d5f0fd0bae4c9f28dcfcf53220 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 09 一月 2025 14:49:51 +0800
Subject: [PATCH] zjh20250109
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 5cf465f..ca7111a 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
@@ -15,6 +15,7 @@
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.DateUtils;
+import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.DictUserInfoMapper;
@@ -1382,10 +1383,15 @@
cell.setHorizontalAlignment(Element.ALIGN_CENTER);
cell.setPaddingTop(10);
cell.setPaddingBottom(10);
- if (zongJianYiShiQianMing == null) {
- cell.setPhrase(new Phrase(sysConfigService.selectConfigByKey("pdf_report_zongjianysname"), zongJianFont));
+ String zongjianysname = sysConfigService.selectConfigByKey("pdf_report_zongjianysname");
+ if (zongJianYiShiQianMing == null && StrUtil.isNotBlank(zongjianysname) && !zongjianysname.equals("鏃�")) {
+ cell.setPhrase(new Phrase(zongjianysname, zongJianFont));
tableQz.addCell(cell);
- }else {
+ }else if(zongJianYiShiQianMing == null && zongjianysname.equals("鏃�")){
+ String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+ cell.setPhrase(new Phrase(nickName, zongJianFont));
+ tableQz.addCell(cell);
+ } else {
byte[] bytes = Base64.getDecoder().decode(zongJianYiShiQianMing.getTemplate());
Image image = Image.getInstance(bytes);
image.scaleToFit(100, 100);
@@ -1499,8 +1505,8 @@
tjtype = "涓汉";
hashMap.put("tjtype", tjtype);
}
- if (StrUtil.isNotBlank(customer.getCompName())){
- hashMap.put("work", customer.getCompName());
+ if (StrUtil.isNotBlank(tjOrder.getFirmName())){
+ hashMap.put("work", tjOrder.getFirmName());
}else {
// LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
// wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
@@ -1511,6 +1517,11 @@
} else {
hashMap.put("work", tjOrder.getFirmName());
}
+ }
+ if (StrUtil.isBlank(tjOrder.getFirmDeptName())) {
+ hashMap.put("bumen", "鏃�");
+ } else {
+ hashMap.put("bumen",tjOrder.getFirmDeptName());
}
hashMap.put("sex", sex);
hashMap.put("tjnumber", tjNumber);
@@ -2683,13 +2694,17 @@
LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LtkjExamJcbgd::getTjh,tjNumber);
wrapper.like(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId()));
- LtkjExamJcbgd jcbgd = jcbgdService.getOne(wrapper);
- if (jcbgd != null){
- tjPdfVO.setTs(jcbgd.getYxbx());
- tjPdfVO.setSj(jcbgd.getBgNr());
- tjPdfVO.setShys(jcbgd.getShysxm());
- tjPdfVO.setProName(jcbgd.getXmmc());
- ids+="|"+jcbgd.getXmdm();
+ wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
+ List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
+ if(null !=list && !list.isEmpty()){
+ LtkjExamJcbgd jcbgd = list.get(0);
+ if (jcbgd != null){
+ tjPdfVO.setTs(jcbgd.getYxbx());
+ tjPdfVO.setSj(jcbgd.getBgNr());
+ tjPdfVO.setShys(jcbgd.getShysxm());
+ tjPdfVO.setProName(jcbgd.getXmmc());
+ ids+="|"+jcbgd.getXmdm();
+ }
}
tjPdfVOS.add(tjPdfVO);
}
--
Gitblit v1.8.0