From 6a7389dea30ef63c60b2cfdb93474092acbede3f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 21 一月 2025 15:16:34 +0800
Subject: [PATCH] zjh20250121
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 90 ++++++++++++++++++---------------------------
1 files changed, 36 insertions(+), 54 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 5ee9777..6c3d023 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
@@ -113,6 +113,8 @@
private TjOrderDetailMapper tjOrderDetailMapper;
@Autowired
private SysDeptController sysDeptController;
+ @Autowired
+ private ITjProAdvicerulesService tjProAdvicerulesService;
private Integer pdfPage = 0;
@@ -507,7 +509,7 @@
//
// }
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",i.get(2),tjOrder.getTjNumber());
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",i.get(2),tjOrder.getTjNumber(),i.get(5),"");
if (!maps.isEmpty()){
for (Map<String, Object> objectMap : maps) {
// paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
@@ -587,7 +589,7 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber(),detail.getProName(),"");
for (Map<String, Object> objectMap : maps) {
String content1 = str+objectMap.get("bt").toString()+objectMap.get("nr").toString();
if (StrUtil.isBlank(content1)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
@@ -1085,52 +1087,16 @@
}
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
paragraph = PdfUtils.setParagraph(defaultFont, "");
paragraph.setLeading(0f);
paragraph.setSpacingBefore(10f);
paragraph.setSpacingAfter(10f);
document2.add(paragraph);
-
-
-
-
-
-
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
paragraph.setSpacingBefore(3f);
paragraph.setSpacingAfter(2f);
document2.add(paragraph);
xmXh = 0;
-
for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
List<CsProVo> proVos = deptEntry.getValue();
if (proVos.size() > 1) {
@@ -1170,9 +1136,9 @@
builder.append(" (").append(index1).append(")").append(s).append("\n");
index1++;
}
- if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+// if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
// if (!contains) builder.append(" (").append(index1).append(")").append(" ");
- else builder.substring(0,builder.length() - 1);
+// else builder.substring(0,builder.length() - 1);
result = builder.toString();
}
// String content = " (" + index + ") " + detail.getProName() + "锛�" + result;
@@ -1189,8 +1155,26 @@
document2.add(paragraph);
}
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
- for (Map<String, Object> objectMap : maps) {
+// List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
+// detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+// .replaceAll("[ 娴嬪畾妫�娴媇",""),detail.getProResult());
+ List<Map<String, Object>> maps =new ArrayList<>();
+ if(detail.getDeptId().equals("2")){
+ String[] split = result.split("銆倈,|锛�");
+ for (String s : split) {
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
+// Map<String,Object> mapss= tjRulesService.getyichangxiangmujianyiguizeJianCha(s);
+ Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(detail.getKs(),s,"0");
+ if(null !=mapss){
+ Object bt = mapss.get("bt");
+ Object nr = mapss.get("nr");
+ if(null !=bt && null !=nr) maps.add(mapss);
+ }
+ }
+ }
+ List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
+
+ for (Map<String, Object> objectMap : collect1) {
String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
// if (StrUtil.isBlank(content)) content = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
if (StrUtil.isBlank(content)) content = " ";
@@ -1241,7 +1225,9 @@
//
// }
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",i.get(2),tjOrder.getTjNumber());
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",
+ i.get(2),tjOrder.getTjNumber(),i.get(0).replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇",""),i.get(1));
if (!maps.isEmpty()){
for (Map<String, Object> objectMap : maps) {
// paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
@@ -1259,11 +1245,14 @@
// paragraph = new Paragraph(str+objectMap.get("nr").toString(),defaultFont);
// paragraph.setAlignment(Element.ALIGN_LEFT);
// document2.add(paragraph);
-
- String content1 = str + objectMap.get("bt").toString() + objectMap.get("nr").toString().trim();
+ Object bt = objectMap.get("bt");
+ Object nr = objectMap.get("nr");
+ if(null !=bt && null !=nr){
+ String content1 = str +bt .toString() +nr .toString().trim();
+ if (StrUtil.isBlank(content)) content1 = " ";
+ paragraph = new Paragraph(content1,defaultFont);
+ }
// if (StrUtil.isBlank(content)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
- if (StrUtil.isBlank(content)) content1 = " ";
- paragraph = new Paragraph(content1,defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
}
@@ -1285,17 +1274,10 @@
}
}
}
-
-
-
-
-
-
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
document2.add(paragraph);
}
-
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鎬绘鍖荤敓寤鸿锛�");
document2.add(paragraph);
if (tjOrder.getCheckAdvice() == null) {
--
Gitblit v1.8.0