liusheng
15 小时以前 1be48553ad7b1994ed6f7d0d868f0ef7ba8a67af
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -14,6 +14,8 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.quartz.service.ICollectHISMapperService;
import com.ruoyi.quartz.service.impl.CollectHISMapperServiceImpl;
import com.smartor.common.LSHospTokenUtil;
import com.smartor.domain.*;
import com.smartor.mapper.HeLibraryMapper;
@@ -130,6 +132,9 @@
    @Autowired
    IXHGatherPatArchiveService ixhGatherPatArchiveService;
    @Autowired
    ICollectHISMapperService icollectHis;
    @Value("${appid}")
@@ -352,10 +357,21 @@
                //丽水有的医院还没法做长期任务随访
                List<ServiceSubtask> subtaskList2 = new ArrayList<>();
                if (visitHosp == 2) {
                    for (ServiceSubtask serviceSubtask : subtaskList) {
                        Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
                        if (b) subtaskList2.add(serviceSubtask);
                    try {
                        for (ServiceSubtask serviceSubtask : subtaskList) {
                            Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
                            if (b) subtaskList2.add(serviceSubtask);
                        }
                    } catch (Exception e) {
                        log.error("-------长期任务异常为:", e);
                        continue;
                    }
//                    for (ServiceSubtask serviceSubtask : subtaskList) {
//                        Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
//
//                        if (b) subtaskList2.add(serviceSubtask);
//                    }
                    subtaskList = subtaskList2;
                }
@@ -748,4 +764,16 @@
        }
        return toHex(md5.digest());
    }
    public void collectHIS() {
        try {
            // HIS数据采集
            HnDataGatherVO hnDataGatherVO = new HnDataGatherVO();
            log.info("【dealHisData】HIS开始采集数据");
            ihnGatherPatArchiveService.hnDataGather(hnDataGatherVO);
            log.info("【dealHisData】HIS结束采集数据");
        } catch (Exception e) {
            log.error("【dealHisData】HIS数据采集异常", e);
        }
    }
}