From 15bffae49de7532f456eb5a5f33dc16217b86771 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 15 一月 2025 17:40:46 +0800
Subject: [PATCH] zjh20250115
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 13 ++++++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 4 +++-
2 files changed, 15 insertions(+), 2 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..c27e0f3 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
@@ -1190,7 +1190,18 @@
}
String str = " ";
List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
- for (Map<String, Object> objectMap : maps) {
+ if(detail.getDeptId().equals("2")){
+ String[] split = result.split("銆�");
+ for (String s : split) {
+ Map<String,Object> mapss= tjRulesService.getyichangxiangmujianyiguizeJianCha(s);
+ 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 = " ";
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index c92e1f5..f185fb7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1668,7 +1668,9 @@
for (String s : split) {
Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
if(null !=maps && !maps.isEmpty()){
- mapList.add(maps);
+ Object bt = maps.get("bt");
+ Object nr = maps.get("nr");
+ if(null !=bt && null !=nr) mapList.add(maps);
}
}
tjOrderDetail.setAdvices(mapList);
--
Gitblit v1.8.0