Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CDS Hooks FHIRQueryGenerator ValueSet Expansion Configuration for Remote Providers #711

Merged
merged 2 commits into from
Apr 25, 2023
Merged

CDS Hooks FHIRQueryGenerator ValueSet Expansion Configuration for Remote Providers #711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc1cfae
Configuring query generator to expand value sets for remote data and …
c-schuler Apr 25, 2023
aa14d00
Merge branch 'master' into expand-vs-remote-dp
c-schuler Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/CqlEvaluationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,26 @@ private void setupDataProvider(DaoRegistry daoRegistry) {
if (useServerData) {
JpaFhirRetrieveProvider jpaRetriever = new JpaFhirRetrieveProvider(daoRegistry, searchParameterResolver);
jpaRetriever.setModelResolver(modelResolver);
if (!(terminologyProvider instanceof JpaTerminologyProvider)) {
this.queryGenerator.setExpandValueSets(true);
}
jpaRetriever.setFhirQueryGenerator(queryGenerator);
jpaRetriever.setTerminologyProvider(terminologyProvider);
if (terminologyEndpoint != null)
if (terminologyEndpoint != null) {
jpaRetriever.setExpandValueSets(true);
}
retrieveProviders.add(jpaRetriever);
}
if (dataEndpoint != null) {
RestFhirRetrieveProvider restRetriever = new RestFhirRetrieveProvider(
searchParameterResolver, resolveRemoteClient(dataEndpoint));
restRetriever.setModelResolver(modelResolver);
this.queryGenerator.setExpandValueSets(true);
restRetriever.setFhirQueryGenerator(queryGenerator);
restRetriever.setTerminologyProvider(terminologyProvider);
if (terminologyEndpoint != null)
if (terminologyEndpoint != null) {
restRetriever.setExpandValueSets(true);
}
retrieveProviders.add(restRetriever);
}
dataProvider = new CompositeDataProvider(modelResolver, new PriorityRetrieveProvider(retrieveProviders));
Expand Down