Added population identifier to measure report as requested in issue #28

cqframework · Feb 5, 2018 · a97c6df · a97c6df
1 parent c42edcf
commit a97c6df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/opencds/cqf/helpers/FhirMeasureEvaluator.java b/src/main/java/org/opencds/cqf/helpers/FhirMeasureEvaluator.java
@@ -41,6 +41,7 @@ else if (result instanceof Iterable) {
                 MeasureReport.MeasureReportGroupPopulationComponent populationReport = new MeasureReport.MeasureReportGroupPopulationComponent();
                 populationReport.setCount(count);
                 populationReport.setCode(population.getCode());
+                populationReport.setIdentifier(population.getIdentifier());
 
                 reportGroup.getPopulation().add(populationReport);
             }
@@ -153,6 +154,7 @@ else if (result instanceof Iterable) {
                 MeasureReport.MeasureReportGroupPopulationComponent populationReport = new MeasureReport.MeasureReportGroupPopulationComponent();
                 populationReport.setCount(count);
                 populationReport.setCode(pop.getCode());
+                populationReport.setIdentifier(pop.getIdentifier());
 
                 /*
                     TODO - it is a reference to a list...

diff --git a/src/test/resources/org/opencds/cqf/population-measure-ccs-bundle.json b/src/test/resources/org/opencds/cqf/population-measure-ccs-bundle.json
@@ -5,7 +5,7 @@
     {
       "resource": {
         "resourceType": "Library",
-        "id": "library-ccs-logic",
+        "id": "measure-ccs-logic",
         "version": "1.0.0",
         "status": "active",
         "experimental": true,

diff --git a/src/test/resources/org/opencds/cqf/population-measure-col-bundle.json b/src/test/resources/org/opencds/cqf/population-measure-col-bundle.json
@@ -5,7 +5,7 @@
     {
       "resource": {
         "resourceType": "Library",
-        "id": "library-col-logic",
+        "id": "measure-col-logic",
         "version": "1.0.0",
         "status": "active",
         "experimental": true,
@@ -222,7 +222,7 @@
         ],
         "library": [
           {
-            "reference": "Library/library-col-logic"
+            "reference": "Library/measure-col-logic"
           }
         ],
         "scoring": {