From 2359d57cf9074650c25956ae9591c1a2e43a873d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 16 五月 2025 17:28:10 +0800
Subject: [PATCH] zjh20250516
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 3a68c77..e6b5ae0 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
@@ -1686,16 +1686,20 @@
}
} else {
- String[] split = tjOrderDetail.getProResult().split("[銆�,锛�:锛�.\\s]+");
+ String regex = configService.selectConfigByKey("jcycjgfgzz");
+ if(StringUtil.isBlank(regex)) regex="銆倈锛泑;|,|锛�";
+ String[] split = tjOrderDetail.getProResult().replaceAll("\n", "").split(regex);
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ","")
- .replaceAll("鐥�","").replaceAll("[0-9]", "");
- Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
- if (null != maps && !maps.isEmpty()) {
- Object bt = maps.get("bt");
- Object nr = maps.get("nr");
- if (null != bt || null != nr) mapList.add(maps);
+ if(StringUtil.isNotBlank(s)){
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ","")
+ .replaceAll("[0-9]", "");
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
+ 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);
--
Gitblit v1.8.0