陈昶聿
4 天以前 81f515126ed3f7acb35e8c61f0a3ae691038a599
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -319,7 +319,6 @@
                    serviceSLTDInhospReqVO.setEncounterTimeStart(nowTime);
                    serviceSLTDInhospReqVO.setEncounterTimeEnd(nowTime);
                    List<String> list = new ArrayList<>();
//                    list.add("FH0108.02");
                    list.add("FH0109.22");
                    list.add("FH0109.23");
                    list.add("FH0109.53");
@@ -342,19 +341,38 @@
                    serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
                    log.debug("【dealHisData】省立同德“入院”結束采集数据,院区:{}", cid);
//                    log.debug("【dealHisData】省立同德“门急诊”开始采集数据,院区:{}", cid);
//                    serviceSLTDInhospReqVO.setStartHeadTime(null);
//                    serviceSLTDInhospReqVO.setStartTailTime(null);
//                    serviceSLTDInhospReqVO.setEncounterTimeStart(nowTime);
//                    serviceSLTDInhospReqVO.setEncounterTimeEnd(nowTime);
//                    serviceSLTDInhospReqVO.setStatusList(null);
//                    List<String> list1 = new ArrayList<>();
//                    list1.add("FH0108.01");
//                    list1.add("FH0108.03");
//                    serviceSLTDInhospReqVO.setHealthcareRecordTypeList(list1);
//                    log.debug("【dealHisData】省立同德“门急诊”采集数据入参:{}", serviceSLTDInhospReqVO);
//                    serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
//                    log.debug("【dealHisData】省立同德“门急诊”束采集数据,院区:{}", cid);
                    // 门急诊分页采集:每页1000条,直到无数据为止
                    log.debug("【dealHisData】省立同德“门急诊”开始分页采集数据,院区:{}", cid);
                    serviceSLTDInhospReqVO.setStartHeadTime(null);
                    serviceSLTDInhospReqVO.setStartTailTime(null);
                    serviceSLTDInhospReqVO.setEncounterTimeStart(nowTime);
                    serviceSLTDInhospReqVO.setEncounterTimeEnd(nowTime);
                    serviceSLTDInhospReqVO.setStatusList(null);
                    List<String> list1 = new ArrayList<>();
                    list1.add("FH0108.01");
                    list1.add("FH0108.03");
                    serviceSLTDInhospReqVO.setHealthcareRecordTypeList(list1);
                    long outpPage = 1L;
                    final long OUTP_PAGE_SIZE = 1000L;
                    while (true) {
                        serviceSLTDInhospReqVO.setCurrent(outpPage);
                        serviceSLTDInhospReqVO.setSize(OUTP_PAGE_SIZE);
                        log.debug("【dealHisData】省立同德“门急诊”采集第{}页数据,院区:{}", outpPage, cid);
                        List<ServiceSLTDInhospResDTO> outpResult = serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
                        if (CollectionUtils.isEmpty(outpResult)) {
                            log.debug("【dealHisData】省立同德“门急诊”第{}页无数据,采集结束,院区:{}", outpPage, cid);
                            break;
                        }
                        log.debug("【dealHisData】省立同德“门急诊”第{}页采集{}条,院区:{}", outpPage, outpResult.size(), cid);
                        if (outpResult.size() < OUTP_PAGE_SIZE) {
                            break;
                        }
                        outpPage++;
                    }
                    // 清除分页参数,避免影响后续出入院查询
                    serviceSLTDInhospReqVO.setCurrent(null);
                    serviceSLTDInhospReqVO.setSize(null);
                    log.debug("【dealHisData】省立同德“门急诊”分页采集完成,院区:{}", cid);
                    log.debug("【dealHisData】省立同德“出院”开始采集数据,院区:{}", cid);
                    serviceSLTDInhospReqVO.setStartHeadTime(null);
@@ -558,20 +576,20 @@
                //2判断一下,当前的sort是不是等于需要执行的总个数,如果等于的话,说明是最后一个,直接将servuce_subtask的状态改成5,执行失败就行了
                Long cs = currentSort.get();
                if (cs.equals(serviceSubtaskPreachforms.size())) {
                    if(serviceSubtask.getPreachform().equals("1")){
                    if (serviceSubtask.getPreachform().equals("1")) {
                        serviceSubtask.setSendstate(7L);
                        serviceSubtask.setRemark("处理补偿任务,当前处理最后补偿 人工超时");
                    }else {
                    } else {
                        serviceSubtask.setSendstate(5L);
                        serviceSubtask.setRemark("处理补偿任务,当前处理最后补偿,全部执行失败");
                    }
                    serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                    //修改发送方式的状态为失败
                    if(serviceSubtaskPreachform.getPreachform().equals("1")){
                    if (serviceSubtaskPreachform.getPreachform().equals("1")) {
                        serviceSubtaskPreachform.setSendstate("7");
                        serviceSubtaskPreachform.setId(id.get());
                    }else {
                    } else {
                        serviceSubtaskPreachform.setSendstate("5");
                        serviceSubtaskPreachform.setId(id.get());
                    }
@@ -905,7 +923,12 @@
                    Boolean wxCodeSuccess = false;
                    if (active.equals("hzszlyy")) {
                        if (!map.isEmpty() && map.get("success") != null) {
                            wxCodeSuccess = (boolean) map.get("success");
                            Integer wxCodeSuccessShiyi = (Integer) map.get("success");
                            if(ObjectUtils.isNotEmpty(wxCodeSuccessShiyi) && wxCodeSuccessShiyi == 1){
                                wxCodeSuccess = true;
                            }else {
                                wxCodeSuccess = false;
                            }
                        }
                    } else {
                        if (!map.isEmpty() && map.get("succ") != null) {
@@ -999,8 +1022,9 @@
                    //说明全发送失败了
                    serviceSubtask.setSendstate(5L);
                    log.error("getSendPreachform方法 检查是否所有sendstate不等于9, 全失败了");
                    serviceSubtask.setRemark("所有发送方式均未获取结果,任务失败");
                    //人工发送超时
                    if(ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")){
                    if (ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                        serviceSubtask.setSendstate(7L);
                        serviceSubtask.setRemark("人工发送超时");
                    }
@@ -1045,10 +1069,8 @@
                serviceSubtaskPreachform.setPreachform(nextPreachform);
                serviceSubtaskPreachformMapper.updateSSPByCondition(serviceSubtaskPreachform);
            }
            return nextPreachform;
        }
        return null;
    }
@@ -1088,7 +1110,7 @@
            subtaskPreachform.setSendstate("5");
            subtaskPreachform.setId(id.get());
            //人工发送超时
            if(ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")){
            if (ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                subtaskPreachform.setSendstate("7");
                subtaskPreachform.setRemark("人工发送超时");
            }
@@ -1216,7 +1238,7 @@
                if (failSendstate.equals("2")) serviceSubtaskPreachform1.setSendstate("9");
            }
            serviceSubtaskPreachform1.setRemark(remark);
            if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1")){
            if (ObjectUtils.isNotEmpty(preachform) && preachform.equals("1")) {
                serviceSubtaskPreachform1.setSendstate("7");
                serviceSubtaskPreachform1.setRemark("人工发送超时");
            }
@@ -1224,17 +1246,19 @@
            //如果当前的preachform已经是最后一个了,那直接将serviceSubtask的sendstate状态改成5就行了(全失败了)
            if (serviceSubtaskPreachform1.getSort() == sspCount.size()) {
                if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1")){
                if (ObjectUtils.isNotEmpty(preachform) && preachform.equals("1")) {
                    serviceSubtask.setCurrentPreachform(preachform);
                    serviceSubtask.setSendstate(7L);
                    serviceSubtask.setRemark("人工发送超时");
                    serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                    return true;
                }else {
                } else {
                    if (failSendstate.equals("4") || failSendstate.equals("5")) {
                        serviceSubtask.setCurrentPreachform(preachform);
                        serviceSubtask.setSendstate(5L);
                        serviceSubtask.setRemark("setSuccessPreachForm方法,当前的preachform已经是最后一个了,全部执行失败");
                        log.error("setSuccessPreachForm方法,当前的preachform已经是最后一个了,全部执行失败");
                        serviceSubtask.setRemark("所有发送方式均未获取结果,任务失败");
                        //serviceSubtask.setRemark("setSuccessPreachForm方法,当前的preachform已经是最后一个了,全部执行失败");
                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                        return true;
                    }
@@ -1248,10 +1272,10 @@
        //将下一次的随访时间与当前执行方式记录一下
        serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime()));
        serviceSubtask.setCurrentPreachform(preachform);
        if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1")){
        if (ObjectUtils.isNotEmpty(preachform) && preachform.equals("1")) {
            serviceSubtask.setSendstate(7L);
            serviceSubtask.setRemark("人工发送超时");
        }else {
        } else {
            serviceSubtask.setSendstate(3L);
        }
        if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {