From ac544c1d85c53e7f51e4ea76aa2489a14aef03d9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 18:57:45 +0800
Subject: [PATCH] zjh20250620

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
index 812ee9f..a96d7a8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -159,7 +159,9 @@
                                 if(null !=list && !list.isEmpty()){
                                     for (LtkjExamJcsqd jcsqd : list) {
                                         if(StringUtil.isNotBlank(jcsqd.getJgzt())){
-                                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+                                            String regex = configService.selectConfigByKey("jcycxmzz");
+                                            if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�";
+                                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
                                             for (String jg : split) {
                                                 if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
                                                         && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
@@ -293,13 +295,15 @@
 
         try {
             List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hospId);
+            log.info("鑷姩鍚屾妫�鏌ョ敵璇峰崟鏁版嵁:"+jcsqdList);
             if (null != jcsqdList && !jcsqdList.isEmpty()) {
                 DynamicDataSourceContextHolder.clearDataSourceType();
                 jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
                 jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
                 jcsqdService.saveBatch(jcsqdList);
                 List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
-                DynamicDataSourceContextHolder.clearDataSourceType();
+//                DynamicDataSourceContextHolder.clearDataSourceType();
+                log.info("鑷姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:"+jcbgdList);
                 if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
                 DynamicDataSourceContextHolder.clearDataSourceType();
             }

--
Gitblit v1.8.0