Browse Source

被覆盖的部分代码

huangzhiyong 7 years ago
parent
commit
a6d8ed0f78

+ 3 - 3
hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/CrawlerManager.java

@ -169,7 +169,7 @@ public class CrawlerManager {
        }
        if ((end.getTime() - begin.getTime()) <= 0) {
            return Result.error("错误:采集结束时间小于开始时间!"); //结束时间小于开始时间时,不获取
            return Result.error("错误:采集上传结束时间小于开始时间!jobId: "+jobId +",start:"+begin.toString()+" end: "+end.toString()); //结束时间小于开始时间时,不获取
        }
        end = DateUtil.fromatDateToTimestamp(end);
@ -178,7 +178,7 @@ public class CrawlerManager {
            //调整截止时间,当前时间-偏移量
            end = DateUtil.addDate(-rsJobConfig.getDelayTime(), DateUtil.getSysDateTime());
            if ((end.getTime() - begin.getTime()) <= 0) {
                return Result.success("错误:采集结束时间小于开始时间!"); //结束时间小于开始时间时,不获取
                return Result.error("调整截止时间偏移量错误:采集上传结束时间小于开始时间!jobId: " + jobId + ",start:" + begin.toString() + " end: " + end.toString()); //结束时间小于开始时间时,不获取
            }
        }
@ -309,7 +309,7 @@ public class CrawlerManager {
            qcDataSet.set("total", objectMapper.convertValue(adapterDataSetMap.keySet().toArray(), JsonNode.class));
            qcDataSet.set("real", objectMapper.convertValue(realList, JsonNode.class));
            boolean b = dispatch.toQcDataSetFile(qcDataSet, patient);//生成数据集质控文件
            logger.info("采集病人数据成功,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
            logger.info("上传档案流程-获取病人信息成功,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
            //上传档案
            logger.info("上传病人档案及质控数据");
            try {