From 6341f129682926b3909604e9b04dc95199c2059a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 09 五月 2025 18:15:01 +0800
Subject: [PATCH] zjh20250509

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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 30c002a..097a840 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
@@ -1798,12 +1798,12 @@
                                 if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                                     if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
                                         if (!tjOrderDetail.getDeptId().equals("2")) {
+                                            String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+                                                    .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
                                             List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
-                                                    , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll("鈼�","")
-                                                            .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""),
+                                                    , replacedAll,
                                                     tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
-                                                    , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
-                                                            .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�","")
+                                                    ,replacedAll
                                                     , tjOrderDetail.getProResult());
 
 
@@ -1812,11 +1812,11 @@
                                             }
 
                                         } else {
-                                            String[] split = tjOrderDetail.getProResult().split("銆倈锛泑;|,|锛�");
+                                            String[] split = tjOrderDetail.getProResult().split("[銆�,锛�:锛�.\\s]+");
                                             List<Map<String, Object>> mapList = new ArrayList<>();
                                             for (String s : split) {
-                                                s = s.replaceAll("\n", "");
-                                                //                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+                                                s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ","")
+                                                        .replaceAll("鐥�","").replaceAll("[0-9]", "");
                                                 Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
                                                 if (null != maps && !maps.isEmpty()) {
                                                     Object bt = maps.get("bt");
@@ -1888,12 +1888,14 @@
                                     if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                                         if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
                                             if (!tjOrderDetail.getDeptId().equals("2")) {
+
+                                                String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+                                                        .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
+
                                                 List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
-                                                        , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll("鈼�","")
-                                                                .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""),
+                                                        ,replacedAll,
                                                         tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
-                                                        , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
-                                                                .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�","")
+                                                        , replacedAll
                                                         , tjOrderDetail.getProResult());
 
 
@@ -1905,7 +1907,7 @@
                                                 String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
                                                 List<Map<String, Object>> mapList = new ArrayList<>();
                                                 for (String s : split) {
-                                                    s = s.replaceAll("\n", "");
+                                                    s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
                                                     Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
                                                     if (null != maps && !maps.isEmpty()) {
                                                         Object bt = maps.get("bt");

--
Gitblit v1.8.0