From 12614448a0e4c9521cc9d99cc56f4b453705c48c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 18:19:36 +0800
Subject: [PATCH] zjh20250703

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 93246b8..1cedef0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -9,6 +9,7 @@
 import com.ltkj.hosp.service.*;
 import com.ltkj.hosp.sqlDomain.*;
 import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.web.controller.system.SysConfigController;
 import com.ltkj.web.controller.system.TjXdPictureController;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +39,7 @@
  */
 @Slf4j
 @Component
-@Profile("!dev & !prod & !test")
+@Profile("!dev & !prod & !test & !win-xamjyytest & !win-chkwyytest")
 public class DefaultScheduled {
 
 
@@ -66,6 +67,8 @@
     private TjXdtgmdjgService xdtgmdjgService;
     @Resource
     private TjXdPictureController pictureController;
+    @Autowired
+    private SysConfigController configController;
 
 
     private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -95,7 +98,7 @@
     private void exec() {
         String dsqkssj = configService.selectConfigByKey("dsqkssj");
         String dsqjssj = configService.selectConfigByKey("dsqjssj");
-        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+//        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
         String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
         boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
         log.info("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
@@ -148,14 +151,13 @@
                                     if(null !=list && !list.isEmpty()){
                                         for (LtkjExamJcsqd jcsqd : list) {
                                             if(StringUtil.isNotBlank(jcsqd.getJgzt())){
-                                                String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+                                                String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
                                                 for (String jg : split) {
-                                                    if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
-                                                            && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
-                                                            && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝e父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
+                                                    boolean b = configController.apiJcycpdgjz(jg);
+                                                    if(!b){
                                                         TjJcycxm jcycxm=new TjJcycxm();
                                                         jcycxm.setTjh(s);
-                                                        jcycxm.setYqid(yqbm);
+                                                        jcycxm.setYqid(dqyyyqbm);
                                                         String[] split1 = jcsqd.getJcxmid().split(";");
                                                         jcycxm.setProId(split1[0]);
                                                         jcycxm.setProName(jcsqd.getJcxmmc());
@@ -163,6 +165,19 @@
                                                         jcycxm.setJcjg(jg);
                                                         jcycxmService.save(jcycxm);
                                                     }
+                                            /*        if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+                                                            && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+                                                            && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝e父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
+                                                        TjJcycxm jcycxm=new TjJcycxm();
+                                                        jcycxm.setTjh(s);
+                                                        jcycxm.setYqid(dqyyyqbm);
+                                                        String[] split1 = jcsqd.getJcxmid().split(";");
+                                                        jcycxm.setProId(split1[0]);
+                                                        jcycxm.setProName(jcsqd.getJcxmmc());
+                                                        jcycxm.setCreateTime(new Date());
+                                                        jcycxm.setJcjg(jg);
+                                                        jcycxmService.save(jcycxm);
+                                                    }*/
                                                 }
                                             }
                                         }

--
Gitblit v1.8.0