From f5b138d01a841c1105695eebcd781aa3b142013d Mon Sep 17 00:00:00 2001
From: Luke deGruchy <luke.degruchy@smiledigitalhealth.com>
Date: Fri, 20 Dec 2024 15:49:40 -0500
Subject: [PATCH 1/2] First checkin.

---
 .../r4/measure/MeasureOperationsProvider.java | 27 ++++++++++---------
 pom.xml                                       | 22 +--------------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java
index dad885dcd78..a33aa4cb4f0 100644
--- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java
+++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java
@@ -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 {
@@ -89,18 +90,18 @@ public MeasureReport evaluateMeasure(
 		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);
+					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());
 	}
 }
diff --git a/pom.xml b/pom.xml
index 7b54f4fb530..905d13d6620 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
 

From 8b45def34cdf5d6046883c0f56ca8b81f3845b0b Mon Sep 17 00:00:00 2001
From: Luke deGruchy <luke.degruchy@smiledigitalhealth.com>
Date: Tue, 7 Jan 2025 13:22:09 -0500
Subject: [PATCH 2/2] Save changes.

---
 .../uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java
index a33aa4cb4f0..17ef375a6cf 100644
--- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java
+++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java
@@ -89,10 +89,10 @@ public MeasureReport evaluateMeasure(
 			throws InternalErrorException, FHIRException {
 		return myR4MeasureServiceFactory
 				.create(theRequestDetails)
-				.evaluate(
-					R4MeasureEvaluatorSingleRequest.builder()
+				.evaluate(R4MeasureEvaluatorSingleRequest.builder()
 						.setMeasure(Eithers.forMiddle3(theId))
-						.setPeriodStart(myStringTimePeriodHandler.getStartZonedDateTime(thePeriodStart, theRequestDetails))
+						.setPeriodStart(
+								myStringTimePeriodHandler.getStartZonedDateTime(thePeriodStart, theRequestDetails))
 						.setPeriodEnd(myStringTimePeriodHandler.getEndZonedDateTime(thePeriodEnd, theRequestDetails))
 						.setReportType(theReportType)
 						.setSubjectId(theSubject)