Merge remote-tracking branch 'origin/master' into rel_7_3_tracking
This commit is contained in:
@@ -61,8 +61,8 @@ import static org.opencds.cqf.fhir.utility.r4.Parameters.stringPart;
|
||||
"hapi.fhir.subscription.websocket_enabled=true",
|
||||
//"hapi.fhir.mdm_enabled=true",
|
||||
"hapi.fhir.cr.enabled=true",
|
||||
"hapi.fhir.cr.caregaps_section_author=Organization/alphora-author",
|
||||
"hapi.fhir.cr.caregaps_reporter=Organization/alphora",
|
||||
"hapi.fhir.cr.caregaps.section_author=Organization/alphora-author",
|
||||
"hapi.fhir.cr.caregaps.reporter=Organization/alphora",
|
||||
"hapi.fhir.implementationguides.dk-core.name=hl7.fhir.dk.core",
|
||||
"hapi.fhir.implementationguides.dk-core.version=1.1.0",
|
||||
"hapi.fhir.auto_create_placeholder_reference_targets=true",
|
||||
@@ -130,13 +130,6 @@ class ExampleServerR4IT implements IServerSupport {
|
||||
assertEquals(measureUrl + "|0.0.003", report.getMeasure());
|
||||
}
|
||||
|
||||
private org.hl7.fhir.r4.model.Bundle loadBundle(String theLocation, FhirContext theCtx, IGenericClient theClient) throws IOException {
|
||||
String json = stringFromResource(theLocation);
|
||||
org.hl7.fhir.r4.model.Bundle bundle = (org.hl7.fhir.r4.model.Bundle) theCtx.newJsonParser().parseResource(json);
|
||||
org.hl7.fhir.r4.model.Bundle result = theClient.transaction().withBundle(bundle).execute();
|
||||
return result;
|
||||
}
|
||||
|
||||
public Parameters runCqlExecution(Parameters parameters) {
|
||||
|
||||
var results = ourClient.operation().onServer()
|
||||
@@ -274,8 +267,8 @@ class ExampleServerR4IT implements IServerSupport {
|
||||
@Test
|
||||
void testCareGaps() throws IOException {
|
||||
|
||||
var reporter = crProperties.getCareGapsReporter();
|
||||
var author = crProperties.getCareGapsSectionAuthor();
|
||||
var reporter = crProperties.getCareGaps().getReporter();
|
||||
var author = crProperties.getCareGaps().getSection_author();
|
||||
|
||||
assertTrue(reporter.equals("Organization/alphora"));
|
||||
assertTrue(author.equals("Organization/alphora-author"));
|
||||
|
||||
Reference in New Issue
Block a user