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

First checkin. #6573

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

First checkin. #6573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5b138d
First checkin.
lukedegruchy Dec 20, 2024
8b45def
Save changes.
lukedegruchy Jan 7, 2025
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
29 changes: 15 additions & 14 deletions hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.hl7.fhir.r4.model.Measure;
import org.hl7.fhir.r4.model.MeasureReport;
import org.hl7.fhir.r4.model.Parameters;
import org.opencds.cqf.fhir.cr.measure.r4.R4MeasureEvaluatorSingleRequest;
import org.opencds.cqf.fhir.utility.monad.Eithers;

public class MeasureOperationsProvider {
Expand Down Expand Up @@ -88,19 +89,19 @@ public MeasureReport evaluateMeasure(
throws InternalErrorException, FHIRException {
return myR4MeasureServiceFactory
.create(theRequestDetails)
.evaluate(
Eithers.forMiddle3(theId),
myStringTimePeriodHandler.getStartZonedDateTime(thePeriodStart, theRequestDetails),
myStringTimePeriodHandler.getEndZonedDateTime(thePeriodEnd, theRequestDetails),
theReportType,
theSubject,
theLastReceivedOn,
null,
theTerminologyEndpoint,
null,
theAdditionalData,
theParameters,
theProductLine,
thePractitioner);
.evaluate(R4MeasureEvaluatorSingleRequest.builder()
.setMeasure(Eithers.forMiddle3(theId))
.setPeriodStart(
myStringTimePeriodHandler.getStartZonedDateTime(thePeriodStart, theRequestDetails))
.setPeriodEnd(myStringTimePeriodHandler.getEndZonedDateTime(thePeriodEnd, theRequestDetails))
.setReportType(theReportType)
.setSubjectId(theSubject)
.setLastReceivedOn(theLastReceivedOn)
.setTerminologyEndpoint(theTerminologyEndpoint)
.setAdditionalData(theAdditionalData)
.setParameters(theParameters)
.setProductLine(theProductLine)
.setPractitioner(thePractitioner)
.build());
}
}
22 changes: 1 addition & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,12 +1087,7 @@
<ucum_version>1.0.8</ucum_version>

<!-- Clinical Reasoning & CQL Support -->
<clinical-reasoning.version>3.15.0</clinical-reasoning.version>
<!-- TODO: LD: this a TEMPORARY HACK to get around the fact that CR 3.15.0 is missing a pom file -->
<!-- This needs to be removed next time we do a CR bump -->
<!-- See: https://github.com/hapifhir/hapi-fhir/issues/6567 -->
<!-- Direct CQL dependencies -->
<cql.version>3.19.1</cql.version>
<clinical-reasoning.version>3.16.0-SNAPSHOT</clinical-reasoning.version>

<!-- Site properties -->
<fontawesomeVersion>5.4.1</fontawesomeVersion>
Expand Down Expand Up @@ -2397,21 +2392,6 @@
</exclusion>
</exclusions>
</dependency>

<!-- TODO: LD: this a TEMPORARY HACK to get around the fact that CR 3.15.0 is missing a pom file -->
<!-- This needs to be removed next time we do a CR bump -->
<!-- See: https://github.com/hapifhir/hapi-fhir/issues/6567 -->
<!-- Direct CQL dependencies -->
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>cql-to-elm</artifactId>
<version>${cql.version}</version>
</dependency>
<dependency>
<groupId>info.cqframework</groupId>
<artifactId>cqf-fhir</artifactId>
<version>${cql.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Loading