|
@ -11,6 +11,7 @@ import com.yihu.ehr.framework.util.operator.CollectionUtil;
|
|
|
import com.yihu.ehr.framework.util.operator.StringUtil;
|
|
|
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
|
|
|
import com.yihu.ehr.standard.model.adapter.AdapterDatasetModel;
|
|
|
import com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel;
|
|
|
import com.yihu.ehr.standard.service.adapter.AdapterDatasetService;
|
|
|
import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
|
|
|
import com.yihu.ehr.standard.service.bo.AdapterVersion;
|
|
@ -26,7 +27,7 @@ public class CrawlerManager {
|
|
|
private static volatile CrawlerManager instance;
|
|
|
private static DataCollectDispatcher dispatch;
|
|
|
private List<AdapterDataSet> adapterDataSetList;
|
|
|
private String version;
|
|
|
private Boolean adapterFlg = false;
|
|
|
private List<Patient> patientList;
|
|
|
public CrawlerManager() {
|
|
|
dispatch = DataCollectDispatcher.getInstance();
|
|
@ -132,13 +133,14 @@ public class CrawlerManager {
|
|
|
}
|
|
|
|
|
|
public Boolean getAdapterDataSetList() {
|
|
|
if (StringUtil.isEmpty(version)) {
|
|
|
if (!adapterFlg) {
|
|
|
adapterDataSetList = new ArrayList<>();
|
|
|
AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
|
|
|
version = adapterSchemeVersionService.getEhrAdapterVersionLasted();
|
|
|
if (StringUtil.isEmpty(version)) {
|
|
|
AdapterSchemeVersionModel adapterSchemeVersionModel = adapterSchemeVersionService.getEhrAdapterVersionLasted();
|
|
|
if (adapterSchemeVersionModel == null) {
|
|
|
return false;
|
|
|
}
|
|
|
String version = adapterSchemeVersionModel.getVersion();
|
|
|
AdapterVersion adapterVersion = new AdapterVersion(version);
|
|
|
AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
|
|
|
Map<String, String> condition = new HashMap<>();
|
|
@ -148,8 +150,9 @@ public class CrawlerManager {
|
|
|
for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
|
|
|
adapterDataSetList.add(new AdapterDataSet(adapterDatasetModel, adapterVersion));
|
|
|
}
|
|
|
adapterFlg = true;
|
|
|
}
|
|
|
return true;
|
|
|
return adapterFlg;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@ -169,7 +172,7 @@ public class CrawlerManager {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
public void setVersion(String version) {
|
|
|
this.version = version;
|
|
|
public void setAdapterFlg(Boolean adapterFlg) {
|
|
|
this.adapterFlg = adapterFlg;
|
|
|
}
|
|
|
}
|