HTTP接口修改

liusheng

2025-09-10 c77c1064dc93bc7d4f0a402dd0285082bb354450

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.quartz.service.ICollectHISService;
import com.smartor.common.LSHospTokenUtil;
import com.smartor.domain.*;
import com.smartor.mapper.HeLibraryMapper;
@@ -85,6 +86,10 @@
    @Autowired
    private HeLibraryMapper heLibraryMapper;

    @Autowired
    private ICollectHISService ichService;


    @Value("${localIP}")
    private String localIP;

@@ -130,6 +135,9 @@

    @Autowired
    IXHGatherPatArchiveService ixhGatherPatArchiveService;

    @Autowired
    ICollectHISService icollectHis;


    @Value("${appid}")
@@ -352,10 +360,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 +767,16 @@
        }
        return toHex(md5.digest());
    }

    public void collectHIS() {
        try {
            // HIS数据采集
            HnDataGatherVO hnDataGatherVO = new HnDataGatherVO();
            log.info("【dealHisData】HIS开始采集数据");
            ichService.hnDataGather(hnDataGatherVO);
            log.info("【dealHisData】HIS结束采集数据");
        } catch (Exception e) {
            log.error("【dealHisData】HIS数据采集异常", e);
        }
    }
}