Merge remote-tracking branch 'origin/master'

zhaowenxuan

9 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java

@@ -1,12 +1,15 @@
package com.ltkj.web.config.timer;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.domain.TjXdtgmdjg;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.controller.system.TjXdPictureController;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +38,7 @@
 */
@Slf4j
@Component
@Profile("!dev & !prod & !test")
@Profile("!dev & !prod & !test & !win-xamjyytest & !win-chkwyytest")
public class DefaultScheduled {


@@ -59,6 +62,10 @@
    private TjJcycxmService jcycxmService;
    @Autowired
    private AwsService awsService;
    @Resource
    private TjXdtgmdjgService xdtgmdjgService;
    @Resource
    private TjXdPictureController pictureController;


    private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -88,7 +95,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("定时器自动同步检验检查结果");
@@ -119,6 +126,14 @@
                            log.info("同步检查人员 执行数量->{}", jc.size());
                            for (String s : jc) {
                                extractedjiancha(s,dqyyyqbm);
//                                LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
//                                wq.eq(TjXdtgmdjg::getTjh,s);
//                                List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
//                                if(null !=list && !list.isEmpty()){
//                                    for (TjXdtgmdjg xdtgmdjg : list) {
//                                        pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
//                                    }
//                                }
                            }
                        }
                        Map<String, Object> map = new HashMap<>();
@@ -133,14 +148,14 @@
                                    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("正常")&& !jg.contains("双侧椎间孔无狭窄")){
                                                        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());