Merge branch 'master' of zlf/esb into master

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerFlowManager.java

@@ -100,6 +100,15 @@ public class CrawlerFlowManager {
                return message;
            }
            /**
             * 获取远程版本
             */
            if (!dispatch.getRemoteVersion(patient.getOrgCode())) {
                message = "远程版本获取失败";
                logger.error(message);
                return message;
            }
            Map<String, JsonNode> dataMap = new HashMap<>();
            for (CrawlerFlowHeadModel crawlerFlowHeadModel : crawlerFlowHeadModelList) {
                /**
@@ -253,11 +262,13 @@ public class CrawlerFlowManager {
                    metadataList.add(crawlerFlowModel);
                    crawlerFlowMetadataMap.put(datasetCode, metadataList);
                }
                SysConfig.getInstance().setVersionMap(new HashMap<>());
                adapterFlg = true;
            } catch (Exception e) {
                return false;
                adapterFlg = false;
            }
        }
        return true;
        return adapterFlg;
    }
    /**

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/DataCollectDispatcher.java

@@ -216,39 +216,13 @@ public class DataCollectDispatcher {
        return fecthData(patient, adapterDataSet, queryParams);
    }
    public String fecthData(Patient patient, AdapterDataSet adapterDataSet) {
        List<EhrCondition> queryParams = new ArrayList<>();
        boolean patientId = true;
        if (adapterDataSet.isHavePatientID()) {
            AdapterMetaData adapterMetaData = adapterDataSet.getAdapterMetaDataMap().get(PatientIdentity.getPatientIDCode());
            queryParams.add(new EhrCondition(" = ", adapterMetaData.getAdapterMetadataModel().getStdMetadataCode(), patient.getPatientId()));
        } else {
            patientId = false;
        }
        boolean eventNo = true;
        if (adapterDataSet.isHaveEventNo()) {
            AdapterMetaData adapterMetaData = adapterDataSet.getAdapterMetaDataMap().get(adapterDataSet.getEventNoCode());
            queryParams.add(new EhrCondition(" = ", adapterMetaData.getAdapterMetadataModel().getStdMetadataCode(), patient.getEventNo()));
        } else {
            eventNo = false;
        }
        if (!patientId && !eventNo) {
            logger.error("采集病人数据集至少需要一项病人标识.数据集名:" + adapterDataSet.getAdapterDataSetT().getStdDatasetCode());
            return Constants.EMPTY;
        }
        return fecthData(patient, adapterDataSet, queryParams);
    }
    /**
     * 根据编排任务进行采集
     * @param patient
     * @param adapterDataSet
     * @return
     */
    public String fecthData1(Patient patient, AdapterDataSet adapterDataSet) {
    public String fecthData(Patient patient, AdapterDataSet adapterDataSet) {
        try {
            ObjectMapper mapper = new ObjectMapper();
            List<EhrCondition> queryParams = new ArrayList<>();
@@ -295,7 +269,7 @@ public class DataCollectDispatcher {
                jsonObject.put("event_no", patient.getEventNo());
                String agencyCode = patient.getOrgCode();
                jsonObject.put("org_code", agencyCode);
                jsonObject.put("inner_version", "123456");
                jsonObject.put("inner_version", SysConfig.getInstance().getVersionMap().get(patient.getOrgCode()));
                jsonObject.put("create_date", DateUtil.toString(new Date(), DateUtil.DEFAULT_YMDHMSDATE_FORMAT));
                jsonObject.put("event_time", patient.getReferenceTime());//DateUtil.toString(patient.getReferenceTime(), DateUtil.DEFAULT_YMDHMSDATE_FORMAT)
                if (StringUtil.isEmpty(patient.getReUploadFlg())) {