Skip to content

Add definition based population to Questionnaire $populate #1076

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

Draft
barhodes wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Add definition based population to Questionnaire $populate #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66c0b1f
add definition based population and refactor questionnaire generation…
barhodes Aug 12, 2026
221b2ea
cleanup and tests
barhodes Aug 13, 2026
d57ec41
cleanup and tests
barhodes Aug 14, 2026
336c4e1
cleanup
barhodes Aug 17, 2026
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
32 changes: 25 additions & 7 deletions cqf-fhir-benchmark/src/test/java/org/opencds/cqf/fhir/benchmark/Questionnaires.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package org.opencds.cqf.fhir.benchmark;

import static org.opencds.cqf.fhir.benchmark.questionnaire.TestQuestionnaire.given;
import static org.opencds.cqf.fhir.utility.r4.Parameters.parameters;
import static org.opencds.cqf.fhir.utility.r4.Parameters.stringPart;
import static org.opencds.cqf.fhir.utility.Parameters.newPart;
import static org.opencds.cqf.fhir.utility.Parameters.newStringPart;

import ca.uhn.fhir.context.FhirContext;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.r4.model.IdType;
import org.opencds.cqf.fhir.benchmark.questionnaire.TestQuestionnaire.When;
import org.openjdk.jmh.annotations.Benchmark;
Expand Down Expand Up @@ -33,11 +35,27 @@ public void setupTrial() throws Exception {
this.result = given().repositoryFor(FHIR_CONTEXT, "r4/pa-aslp")
.when()
.questionnaireId(new IdType("Questionnaire", "ASLPA1"))
.subjectId("positive")
.parameters(parameters(
stringPart("Service Request Id", "SleepStudy"),
stringPart("Service Request Id", "SleepStudy2"),
stringPart("Coverage Id", "Coverage-positive")));
.context(Arrays.asList(
(IBaseBackboneElement) newPart(
FHIR_CONTEXT,
"context",
newStringPart(FHIR_CONTEXT, "name", "patient"),
newPart(FHIR_CONTEXT, "Reference", "content", "Patient/positive")),
(IBaseBackboneElement) newPart(
FHIR_CONTEXT,
"context",
newStringPart(FHIR_CONTEXT, "name", "ServiceRequest"),
newPart(FHIR_CONTEXT, "Reference", "content", "ServiceRequest/SleepStudy")),
(IBaseBackboneElement) newPart(
FHIR_CONTEXT,
"context",
newStringPart(FHIR_CONTEXT, "name", "ServiceRequest"),
newPart(FHIR_CONTEXT, "Reference", "content", "ServiceRequest/SleepStudy2")),
(IBaseBackboneElement) newPart(
FHIR_CONTEXT,
"context",
newStringPart(FHIR_CONTEXT, "name", "Coverage"),
newPart(FHIR_CONTEXT, "Reference", "content", "Coverage/Coverage-positive"))));
}

@Benchmark
Expand Down
4 changes: 2 additions & 2 deletions cqf-fhir-benchmark/src/test/java/org/opencds/cqf/fhir/benchmark/helpers/RequestHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.FhirVersionEnum;
import java.util.List;
import org.hl7.fhir.instance.model.api.IBaseDatatype;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.opencds.cqf.fhir.cql.LibraryEngine;
Expand Down Expand Up @@ -101,7 +102,7 @@ public static GenerateRequest newGenerateRequestForVersion(
}

public static GenerateRequest newGenerateRequestForVersion(IBaseResource profile, LibraryEngine libraryEngine) {
return new GenerateRequest(profile, false, true, libraryEngine);
return new GenerateRequest(List.of(profile), false, true, libraryEngine);
}

public static PopulateRequest newPopulateRequestForVersion(
Expand All @@ -111,7 +112,6 @@ public static PopulateRequest newPopulateRequestForVersion(
Ids.newId(fhirVersion, Ids.ensureIdType(PATIENT_ID, "Patient")),
null,
null,
null,
libraryEngine);
}

Expand Down
21 changes: 21 additions & 0 deletions ...enchmark/src/test/java/org/opencds/cqf/fhir/benchmark/helpers/TestEvaluationSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.opencds.cqf.fhir.benchmark.helpers;

import org.opencds.cqf.fhir.cql.EvaluationSettings;
import org.opencds.cqf.fhir.cql.engine.retrieve.RetrieveSettings.SEARCH_FILTER_MODE;
import org.opencds.cqf.fhir.cql.engine.retrieve.RetrieveSettings.TERMINOLOGY_FILTER_MODE;
import org.opencds.cqf.fhir.cql.engine.terminology.TerminologySettings.VALUESET_EXPANSION_MODE;

public class TestEvaluationSettings {

public static EvaluationSettings defaultTestEvaluationSettings() {
var evaluationSettings = EvaluationSettings.getDefault();
evaluationSettings
.getRetrieveSettings()
.setSearchParameterMode(SEARCH_FILTER_MODE.FILTER_IN_MEMORY)
.setTerminologyParameterMode(TERMINOLOGY_FILTER_MODE.FILTER_IN_MEMORY);
evaluationSettings
.getTerminologySettings()
.setValuesetExpansionMode(VALUESET_EXPANSION_MODE.PERFORM_NAIVE_EXPANSION);
return evaluationSettings;
}
}
Loading
Loading