From 070d83ee5ef6e7bae0e36dc422fbfd04b8175b82 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 05 三月 2025 08:47:25 +0800
Subject: [PATCH] 去除建议性别查询条件
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 ea284e3..1ebb89f 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
@@ -34,8 +34,10 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.config.pdfutils.PdfUtils;
import com.ltkj.web.controller.system.SysDeptController;
+import jodd.util.StringUtil;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
+import net.sf.ehcache.search.aggregator.Count;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -1013,11 +1015,9 @@
for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
List<TjOrderYcxm> details = entry.getValue();
String xmmc = entry.getKey();
-// String xmmc = details.get(0).getProName();
boolean isXmWrite = false;
int index = 1;
for (TjOrderYcxm detail : details) {
-// if (!entry.getKey().equals(detail.getProId())) continue;
if (!isXmWrite) {
paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1029,6 +1029,7 @@
result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
StringBuilder builder = new StringBuilder();
if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+
builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
index++;
@@ -1476,9 +1477,11 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), "",
- i.get(2), tjOrder.getTjNumber(), i.get(0).replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", ""), i.get(1));
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), i.get(0).replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""),
+ i.get(2), tjOrder.getTjNumber(), i.get(0).replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), i.get(1));
+
if (!maps.isEmpty()) {
for (Map<String, Object> objectMap : maps) {
Object bt = objectMap.get("bt");
@@ -2591,6 +2594,13 @@
ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
if(null !=hybgds && !hybgds.isEmpty()){
+// hybgds = hybgds.stream().distinct().collect(Collectors.toList());
+ hybgds = new ArrayList<>(hybgds.stream()
+ .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
+ .values());
+
+
+
// hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
// hybgds = hybgds.stream()
// .sorted(Comparator.comparingInt(
--
Gitblit v1.8.0