Fixes cqframework#358

vitorpamplona · Oct 11, 2023 · fe5505b · fe5505b
1 parent 0fe8e3a
commit fe5505b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java
@@ -94,7 +94,7 @@ protected MeasureReport evaluateMeasure(
 
         var evalType = MeasureEvalType.fromCode(reportType)
                 .orElse(
-                        subjectIds.get(0) == null || subjectIds == null || subjectIds.isEmpty()
+                        subjectIds == null || subjectIds.isEmpty() || subjectIds.get(0) == null
                                 ? MeasureEvalType.POPULATION
                                 : MeasureEvalType.SUBJECT);
 

diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java
@@ -85,7 +85,7 @@ protected MeasureReport evaluateMeasure(
 
         var evalType = MeasureEvalType.fromCode(reportType)
                 .orElse(
-                        subjectIds.get(0) == null || subjectIds == null || subjectIds.isEmpty()
+                        subjectIds == null || subjectIds.isEmpty() || subjectIds.get(0) == null
                                 ? MeasureEvalType.POPULATION
                                 : MeasureEvalType.SUBJECT);