|
@ -55,6 +55,22 @@ public class DataCollectDispatcher {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
public Boolean getRemoteVersion (String orgCode) {
|
|
|
try {
|
|
|
if (StringUtil.isEmpty(SysConfig.getInstance().getVersionMap().get(orgCode))) {
|
|
|
String stdVersion = EsbHttp.getRemoteVersion(orgCode);
|
|
|
if (StringUtil.isEmpty(stdVersion)) {
|
|
|
return false;
|
|
|
}
|
|
|
SysConfig.getInstance().getVersionMap().put(orgCode, stdVersion);
|
|
|
}
|
|
|
return true;
|
|
|
} catch (Exception e) {
|
|
|
logger.error("本次任务执行失败,获取token失败!");
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取病人列表
|
|
|
*
|
|
@ -150,7 +166,7 @@ public class DataCollectDispatcher {
|
|
|
return propertyMap;
|
|
|
}
|
|
|
|
|
|
public String fecthData(Patient patient, AdapterDataSet adapterDataSet, List<EhrCondition> queryParams ) {
|
|
|
public String fecthData(Patient patient, AdapterDataSet adapterDataSet, List<EhrCondition> queryParams) {
|
|
|
try {
|
|
|
ObjectMapper mapper = new ObjectMapper();
|
|
|
ObjectNode paramsNode = mapper.createObjectNode();
|
|
@ -175,7 +191,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())) {
|