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 | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 439aa17..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
@@ -1136,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;
@@ -1155,12 +1155,14 @@
document2.add(paragraph);
}
String str = " ";
- 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 = 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("銆�");
+ 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){
@@ -1272,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