From 5c58a8a9fa43c671af54358172f853f02c4acfc7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 16 一月 2025 21:18:36 +0800
Subject: [PATCH] zjh20250116
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
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 f6edc34..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
@@ -1657,10 +1657,25 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
- if(null !=maps && !maps.isEmpty()){
- tjOrderDetail.setAdvices(maps);
+ if(!tjOrderDetail.getDeptId().equals("2")){
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
+ if(null !=maps && !maps.isEmpty()){
+ tjOrderDetail.setAdvices(maps);
+ }
+ }else {
+ String[] split = tjOrderDetail.getProResult().split("銆�");
+ List<Map<String,Object>> mapList=new ArrayList<>();
+ for (String s : split) {
+ Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ if(null !=maps && !maps.isEmpty()){
+ Object bt = maps.get("bt");
+ Object nr = maps.get("nr");
+ if(null !=bt && null !=nr) mapList.add(maps);
+ }
+ }
+ tjOrderDetail.setAdvices(mapList);
}
+
}
dels.add(tjOrderDetail);
--
Gitblit v1.8.0