Merge pull request #306 from DBCG/305_measure_contained_duplicate_val…

…ueCanonical Remove duplicate source part from MeasureReport's measure extension's…
cqframework · Jul 20, 2021 · f8e41bf · f8e41bf
2 parents 131a2dd + e500252
commit f8e41bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dstu3/src/main/java/org/opencds/cqf/dstu3/evaluation/MeasureEvaluation.java b/dstu3/src/main/java/org/opencds/cqf/dstu3/evaluation/MeasureEvaluation.java
@@ -160,7 +160,7 @@ private Resource evaluateObservationCriteria(Context context, Patient patient, R
         Extension obsExtension = new Extension().setUrl("http://hl7.org/fhir/StructureDefinition/cqf-measureInfo");
         Extension extExtMeasure = new Extension()
                 .setUrl("measure")
-                .setValue(new UriType("http://hl7.org/fhir/us/cqfmeasures/" + report.getMeasure()));
+                .setValue(new UriType(report.getMeasure().toString().startsWith("http://") ? report.getMeasure().toString() : ("http://hl7.org/fhir/us/cqfmeasures/" + report.getMeasure())));
         obsExtension.addExtension(extExtMeasure);
         Extension extExtPop = new Extension()
                 .setUrl("populationId")

diff --git a/r4/src/main/java/org/opencds/cqf/r4/evaluation/MeasureEvaluation.java b/r4/src/main/java/org/opencds/cqf/r4/evaluation/MeasureEvaluation.java
@@ -161,7 +161,7 @@ private Resource evaluateObservationCriteria(Context context, Patient patient, R
         Extension obsExtension = new Extension().setUrl("http://hl7.org/fhir/StructureDefinition/cqf-measureInfo");
         Extension extExtMeasure = new Extension()
                 .setUrl("measure")
-                .setValue(new CanonicalType("http://hl7.org/fhir/us/cqfmeasures/" + report.getMeasure()));
+                .setValue(new CanonicalType(report.getMeasure()));
         obsExtension.addExtension(extExtMeasure);
         Extension extExtPop = new Extension()
                 .setUrl("populationId")
@@ -656,7 +656,7 @@ private MeasureReport processAccumulators(MeasureReport report, HashMap<String,
                 Extension obsExtension = new Extension().setUrl("http://hl7.org/fhir/StructureDefinition/cqf-measureInfo");
                 Extension extExtMeasure = new Extension()
                         .setUrl("measure")
-                        .setValue(new CanonicalType("http://hl7.org/fhir/us/cqfmeasures/" + report.getMeasure()));
+                        .setValue(new CanonicalType(report.getMeasure()));
                 obsExtension.addExtension(extExtMeasure);
                 Extension extExtPop = new Extension()
                         .setUrl("populationId")