Merge branch 'rel_7_0' of github.com:hapifhir/hapi-fhir into rel_7_0

hapi-fhir-base/src/test/java/ca/uhn/fhir/util/VersionEnumTest.java

@@ -29,7 +29,7 @@ public class VersionEnumTest {
 		int minor = Integer.parseInt(parts[1]);
 		int patch = Integer.parseInt(parts[2]);
 
-		if (major >= 6 && minor >= 3) {
+		if ((major == 6 && minor >= 3) || (major >= 7)) {
 			if (minor % 2 == 1) {
 				patch = 0;
 			}

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_0_0/5654-measurescorer-bug.yaml

@@ -0,0 +1,5 @@
+type: fix
+issue: 5654
+title: "Fixed a MeasureReport measureScoring bug impacting any measures currently using denominator-exception population will 
+incorrectly calculate the score without following specification. This bug adds an extension to MeasureReport Groups to capture calculated denominator and
+numerator to bring transparency to the measureScore calculation and act as a dataSource of measureScore instead of behind the scenes calculations."

hapi-fhir-storage-cr/src/test/resources/BCSEHEDISMY2022-bundle.json

@@ -1843,6 +1843,7 @@
       "guidance": "* For Medicare plans, I-SNP and LTI exclusions are not included in the measure calculation logic and need to be programmed manually. Administrative data must be used for these exclusions.\n*Non-administrative data may be used for the frailty and advanced illness exclusion.\n<p>**Allocation:**<br/>The member was enrolled with a medical benefit throughout the Participation Period.</p><p>No more than one gap in enrollment of up to 45 days for each full calendar year of the Participation Period (i.e., the Measurement Period and the year prior to the Measurement Period).</p><p>No gaps in enrollment are allowed from October 1 two years prior to the Measurement Period through December 31 two years prior to the Measurement Period.</p><p>**Reporting:**<br/>For Medicare plans, the SES stratifications are mutually exclusive. NCQA calculates a total rate for Medicare plans by adding all six Medicare stratifications.</p><p>SES and product line stratifications are not included in the measure calculation logic and need to be programmed manually.</p><p>**Stratification:**<br/>1. Commercial.\n2. Medicaid.\n3. Medicare: Non-LIS/DE, Nondisability.\n4. Medicare: LIS/DE.\n5. Medicare: Disability\n6. Medicare: LIS/DE and Disability.\n7. Medicare: Other.\n8. Medicare: Unknown.</p>",
       "group": [ {
         "population": [ {
+			  "id": "initial-population",
           "code": {
             "coding": [ {
               "system": "http://terminology.hl7.org/CodeSystem/measure-population",
@@ -1856,6 +1857,7 @@
             "expression": "Initial Population"
           }
         }, {
+			  "id": "denominator",
           "code": {
             "coding": [ {
               "system": "http://terminology.hl7.org/CodeSystem/measure-population",
@@ -1869,6 +1871,7 @@
             "expression": "Denominator"
           }
         }, {
+			  "id": "denominator-exclusion",
           "code": {
             "coding": [ {
               "system": "http://terminology.hl7.org/CodeSystem/measure-population",
@@ -1882,6 +1885,7 @@
             "expression": "Exclusions"
           }
         }, {
+			  "id": "numerator",
           "code": {
             "coding": [ {
               "system": "http://terminology.hl7.org/CodeSystem/measure-population",
@@ -1897,6 +1901,7 @@
         } ]
       } ],
       "supplementalData": [ {
+			"id": "Enrolled-During-Participation-Period",
         "code": {
           "text": "Enrolled During Participation Period"
         },
@@ -1911,6 +1916,7 @@
           "expression": "Enrolled During Participation Period"
         }
       }, {
+			"id": "participation-period",
         "code": {
           "text": "Participation Period"
         },

hapi-fhir-storage-cr/src/test/resources/ColorectalCancerScreeningsFHIR-bundle.json

@@ -147712,7 +147712,7 @@
 					}
 				],
 				"library": [
-					"http://ecqi.healthit.gov/ecqms/Library/ColorectalCancerScreeningsFHIR|0.0.001"
+					"http://ecqi.healthit.gov/ecqms/Library/ColorectalCancerScreeningsFHIR"
 				],
 				"disclaimer": "The performance Measure is not a clinical guideline and does not establish a standard of medical care, and has not been tested for all potential applications. THE MEASURE AND SPECIFICATIONS ARE PROVIDED \"AS IS\" WITHOUT WARRANTY OF ANY KIND.\n \nDue to technical limitations, registered trademarks are indicated by (R) or [R] and unregistered trademarks are indicated by (TM) or [TM].",
 				"scoring": {

hapi-fhir-storage-cr/src/test/resources/Exm104FhirR4MeasureBundle.json

@@ -140,7 +140,7 @@
 					}
 				],
 				"library": [
-					"http://localhost:8080/fhir/Library/library-EXM104|8.2.000"
+					"http://localhost:8080/fhir/Library/EXM104|8.2.000"
 				],
 				"disclaimer": "These performance measures are not clinical guidelines and do not establish a standard of medical care, and have not been tested for all potential applications. The measures and specifications are provided without warranty.",
 				"scoring": {
@@ -177,6 +177,7 @@
 						"id": "group-1",
 						"population": [
 							{
+								"id": "initial-population",
 								"code": {
 									"coding": [
 										{
@@ -192,6 +193,7 @@
 								}
 							},
 							{
+								"id": "numerator",
 								"code": {
 									"coding": [
 										{
@@ -207,6 +209,7 @@
 								}
 							},
 							{
+								"id": "denominator",
 								"code": {
 									"coding": [
 										{
@@ -222,6 +225,7 @@
 								}
 							},
 							{
+								"id": "denominator-exclusion",
 								"code": {
 									"coding": [
 										{
@@ -237,6 +241,7 @@
 								}
 							},
 							{
+								"id": "denominator-exception",
 								"code": {
 									"coding": [
 										{
@@ -341,7 +346,7 @@
 		{
 			"resource": {
 				"resourceType": "Library",
-				"id": "library-EXM104",
+				"id": "EXM104",
 				"extension": [
 					{
 						"url": "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-softwaresystem",
@@ -350,7 +355,7 @@
 						}
 					}
 				],
-				"url": "http://localhost:8080/fhir/Library/library-EXM104",
+				"url": "http://localhost:8080/fhir/Library/EXM104",
 				"version": "8.2.000",
 				"name": "library-EXM104",
 				"status": "active",
@@ -600,7 +605,7 @@
 			},
 			"request": {
 				"method": "PUT",
-				"url": "Library/library-EXM104"
+				"url": "Library/EXM104"
 			}
 		},
 		{

hapi-fhir-storage-cr/src/test/resources/largeValueSetMeasureTest-Bundle.json

@@ -1377,6 +1377,7 @@
             "id": "group-1",
             "population": [
               {
+					  "id": "initial-population",
                 "code": {
                   "coding": [
                     {
@@ -1392,6 +1393,7 @@
                 }
               },
               {
+					  "id": "denominator",
                 "code": {
                   "coding": [
                     {
@@ -1407,6 +1409,7 @@
                 }
               },
               {
+					  "id": "numerator",
                 "code": {
                   "coding": [
                     {

hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-7.0.000-bundle.json

@@ -1372,6 +1372,7 @@
 						"id": "group-1",
 						"population": [
 							{
+								"id": "initial-population",
 								"code": {
 									"coding": [
 										{
@@ -1387,6 +1388,7 @@
 								}
 							},
 							{
+								"id": "numerator",
 								"code": {
 									"coding": [
 										{
@@ -1402,6 +1404,7 @@
 								}
 							},
 							{
+								"id": "denominator",
 								"code": {
 									"coding": [
 										{
@@ -1417,6 +1420,7 @@
 								}
 							},
 							{
+								"id": "denominator-exclusion",
 								"code": {
 									"coding": [
 										{
@@ -1436,6 +1440,7 @@
 				],
 				"supplementalData": [
 					{
+						"id": "sde-ethnicity",
 						"code": {
 							"text": "sde-ethnicity"
 						},
@@ -1455,6 +1460,7 @@
 						}
 					},
 					{
+						"id": "sde-payer",
 						"code": {
 							"text": "sde-payer"
 						},
@@ -1474,6 +1480,7 @@
 						}
 					},
 					{
+						"id": "sde-race",
 						"code": {
 							"text": "sde-race"
 						},
@@ -1493,6 +1500,7 @@
 						}
 					},
 					{
+						"id": "sde-sex",
 						"code": {
 							"text": "sde-sex"
 						},

hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-9.0.000-bundle.json

@@ -1372,6 +1372,7 @@
 						"id": "group-1",
 						"population": [
 							{
+								"id": "initial-population",
 								"code": {
 									"coding": [
 										{
@@ -1387,6 +1388,7 @@
 								}
 							},
 							{
+								"id": "numerator",
 								"code": {
 									"coding": [
 										{
@@ -1402,6 +1404,7 @@
 								}
 							},
 							{
+								"id": "denominator",
 								"code": {
 									"coding": [
 										{
@@ -1417,6 +1420,7 @@
 								}
 							},
 							{
+								"id": "denominator-exclusion",
 								"code": {
 									"coding": [
 										{
@@ -1436,6 +1440,7 @@
 				],
 				"supplementalData": [
 					{
+						"id": "sde-ethnicity",
 						"code": {
 							"text": "sde-ethnicity"
 						},
@@ -1455,6 +1460,7 @@
 						}
 					},
 					{
+						"id": "sde-payer",
 						"code": {
 							"text": "sde-payer"
 						},
@@ -1474,6 +1480,7 @@
 						}
 					},
 					{
+						"id": "sde-race",
 						"code": {
 							"text": "sde-race"
 						},
@@ -1493,6 +1500,7 @@
 						}
 					},
 					{
+						"id": "sde-sex",
 						"code": {
 							"text": "sde-sex"
 						},

pom.xml

@@ -993,7 +993,7 @@
 		<ucum_version>1.0.8</ucum_version>
 
 		<!-- CQL Support -->
-		<clinical-reasoning.version>3.0.0-PRE15</clinical-reasoning.version>
+		<clinical-reasoning.version>3.0.0-PRE17</clinical-reasoning.version>
 
 		<!-- Site properties -->
 		<fontawesomeVersion>5.4.1</fontawesomeVersion>