From 5489d624e6642b459ecf8d143c548ac8a980a8c8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 15 一月 2025 11:36:14 +0800
Subject: [PATCH] zjh20250115
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 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..5ee9777 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;
@@ -1024,6 +1025,7 @@
if (StrUtil.isNotBlank(result)) {
int index = 1;
result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+// result = result.replaceAll("", "");
String[] split = result.split("\n");
StringBuilder builder = new StringBuilder();
for (String s : split) {
@@ -1160,7 +1162,8 @@
// result = "\n " + result.replaceAll("\n", "\n ");
int index1 = 1;
String[] split = result.split("\n");
- boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+// boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+ boolean contains = result.contains(" ");
StringBuilder builder = new StringBuilder();
for (String s : split) {
if (StrUtil.isBlank(s.replaceAll("\n","").trim())) continue;
@@ -1168,6 +1171,7 @@
index1++;
}
if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+// if (!contains) builder.append(" (").append(index1).append(")").append(" ");
else builder.substring(0,builder.length() - 1);
result = builder.toString();
}
@@ -1188,7 +1192,8 @@
List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
for (Map<String, Object> objectMap : maps) {
String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
- if (StrUtil.isBlank(content)) content = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+// if (StrUtil.isBlank(content)) content = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+ if (StrUtil.isBlank(content)) content = " ";
paragraph = new Paragraph(content,defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
@@ -1256,7 +1261,8 @@
// document2.add(paragraph);
String content1 = str + objectMap.get("bt").toString() + objectMap.get("nr").toString().trim();
- if (StrUtil.isBlank(content)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+// if (StrUtil.isBlank(content)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+ if (StrUtil.isBlank(content)) content1 = " ";
paragraph = new Paragraph(content1,defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
@@ -1296,8 +1302,17 @@
paragraph = PdfUtils.setParagraph(defaultFont, "鏃�");
document2.add(paragraph);
} else {
- paragraph = PdfUtils.setParagraph(defaultFont, tjOrder.getCheckAdvice());
- document2.add(paragraph);
+ Paragraph paragraphs = new Paragraph(tjOrder.getCheckAdvice(),defaultFont);
+ //璁剧疆鏂囧瓧灞呬腑
+ paragraphs.setAlignment(Element.ALIGN_LEFT);
+ //琛岄棿璺�
+// paragraphs.setLeading(5f);
+ //璁剧疆娈佃惤涓婄┖鐧�
+ paragraphs.setSpacingBefore(10f);
+ //璁剧疆娈佃惤涓嬬┖鐧�
+ paragraphs.setSpacingAfter(10f);
+// paragraph = PdfUtils.setParagraph(defaultFont, tjOrder.getCheckAdvice());
+ document2.add(paragraphs);
}
@@ -1382,10 +1397,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 +1519,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 +1531,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 +2708,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