5222 storage cr hapifhirretrieveprovider terminology paging bug (#5224)

* update query iterable to page results, update config for batching

* add test for large valueset issue

---------

Co-authored-by: justin.mckelvy <justin.mckelvy@smilecdr.com>

hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirRetrieveProvider.java

@@ -101,11 +101,12 @@ public class HapiFhirRetrieveProvider extends SearchParamFhirRetrieveProvider im
 			@Override
 			public boolean hasNext() {
 				// initial load of first query results
-				if (currentResult == null && index < queries.size()) {
+				if (currentResult == null) {
 					currentResult = loadNext();
 				}
+				// loop through all batches of results
 				// when query results exhaust load next query
-				else if (!currentResult.hasNext()) {
+				while (currentResult != null && !currentResult.hasNext()) {
 					currentResult = loadNext();
 				}
 				// hasNext on current query result

hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java

@@ -111,6 +111,7 @@ public abstract class BaseClinicalReasoningConfig {
 				provider.setTerminologyProvider(t);
 				provider.setExpandValueSets(true);
 				provider.setMaxCodesPerQuery(500);
+				provider.setQueryBatchThreshold(500);
 				provider.setModelResolver(theModelResolver);
 			}
 			return new CompositeDataProvider(theModelResolver, provider);

hapi-fhir-storage-cr/src/test/java/ca/uhn/fhir/cr/r4/R4MeasureOperationProviderIT.java

@@ -147,5 +147,23 @@ class R4MeasureOperationProviderIT extends BaseCrR4TestServer
 
 	}
 
+	@Test
+	void testLargeValuesetMeasure() {
+		this.loadBundle("largeValueSetMeasureTest-Bundle.json");
+
+		var returnMeasureReport = runEvaluateMeasure("2023-01-01", "2024-01-01", null, "CMSTest", "population", null);
+
+		String populationName = "numerator";
+		int expectedCount = 1;
+
+		Optional<MeasureReport.MeasureReportGroupPopulationComponent> population = returnMeasureReport.getGroup().get(0)
+			.getPopulation().stream().filter(x -> x.hasCode() && x.getCode().hasCoding()
+				&& x.getCode().getCoding().get(0).getCode().equals(populationName))
+			.findFirst();
+
+		assertEquals(population.get().getCount(), expectedCount,
+			String.format("expected count for population \"%s\" did not match", populationName));
+
+	}
 
 }