Merge pull request #59 from HL7/R4_Lift

R4 lift

content/hqmf-measure-volume-one.md

@@ -42,7 +42,9 @@ Chapter 1 provides an introduction to this IG, gives a brief history of the IG,
 
 Chapter 2 provides an overview of HQMF structure, how to reference CQL documents in the HQMF document, and how to specify control variables (measure period).
 
-Chapter 3 describes how to reference codes and valuesets in CQL and the accompanying HQMF. Chapter 4 describes how to construct the dataCriteriaSection of the HQMF document.
+Chapter 3 describes how to reference codes and valuesets in CQL and the accompanying HQMF.
+
+Chapter 4 describes how to construct the dataCriteriaSection of the HQMF document.
 
 Chapter 5 discusses measure scoring types, how to specify population criteria in the HQMF document using CQL, and how to specify measure populations in CQL. There are also sections discussing stratification, inclusion of supplemental data, and defining risk adjustment variables.
 
@@ -621,7 +623,7 @@ An HQMF document representing a ratio measure will include one or more populatio
 In addition, it may also include one measure observation section with one or more measureObservation- Definition elements. The semantics of these components are unchanged from the HQMF specification; the only difference is that each measure population component and each measure observation definition references a single criterion encoded as a CQL expression.
 
     Conformance Requirement 12 (Ratio Measures):
-    Population criteria components SHALL each reference a single CQL expression as defined by 
+    Population criteria components SHALL each reference a single CQL expression as defined by
     measureObservationDefinition elements SHALL reference CQL expressions as defined by ., with the exception that instead of a measurePopulationCriteria, the component element SHALL reference a numeratorCriteria or denominatorCriteria by id (i.e. using root and extension attributes).
 
 For patient-based ratio measures, all population criteria must return true or false (or null). For non-patient- based ratio measures, each population criteria must return the same type, such as an Encounter, or Procedure.
@@ -1201,7 +1203,7 @@ The following table summarizes the allowable measure types for each of the compo
 | All-or-nothing | Proportion/Ratio | Proportion/Ratio |
 | Patient-level Linear | Continuous Variable | Proportion/Ratio/Continuous Variable |
 
-Note that these requirements are about ensuring that the population criteria expressions among the components use similar sets of population criteria. This means that all the components of a given composite measure don’t necessarily have to use the same scoring type, just that they have to have similar population criteria. For example, a Proportion composite may use a Proportion component and a Ratio component. 
+Note that these requirements are about ensuring that the population criteria expressions among the components use similar sets of population criteria. This means that all the components of a given composite measure don’t necessarily have to use the same scoring type, just that they have to have similar population criteria. For example, a Proportion composite may use a Proportion component and a Ratio component.
 
 ### 6.6 Measure Basis
 
@@ -1215,7 +1217,7 @@ As with single measures, composite measures may be patient-based, or use some ot
 
     Conformance Requirement 24 (Composite Measure Stratification):
 
-    Stratifiers of components in a composite measure SHALL NOT be used to stratify the composite measure 
+    Stratifiers of components in a composite measure SHALL NOT be used to stratify the composite measure
 
 Because composite measure scoring for individual-based composites effectively ignores component scores, stratifiers defined on component measures are not applicable to the composite measure score. As such, stratifiers are supported in composite measures, just as they are with non-composites, but stratifiers of the component measures are ignored.
 

ig.json

@@ -12,12 +12,12 @@
     "temp": "temp",
     "output": "output",
     "qa": "qa",
-    "specification": "http://hl7.org/fhir/STU3",
+    "specification": "http://hl7.org/fhir/R4",
     "txCache": "txCache",
     "history": "http://hl7.org/fhir/us/cqfmeasures/history.html"
   },
-  "version": "3.0.2",
-  "fixed-business-version": "1.0.0",
+  "version": "4.0.1",
+  "fixed-business-version": "1.1.0",
   "license": "CC0-1.0",
   "logging": ["init", "progress", "context", "html", "tx"],
   "dependencyList": [
@@ -95,7 +95,10 @@
     "profile-proportion-measure-cqfm-spreadsheet.xml",
     "profile-ratio-measure-cqfm-spreadsheet.xml",
     "profile-continuous-variable-measure-cqfm-spreadsheet.xml",
-    "profile-cohort-measure-cqfm-spreadsheet.xml"
+    "profile-cohort-measure-cqfm-spreadsheet.xml",
+    "profile-testcase-bundle-cqfm-spreadsheet.xml",
+    "profile-library-bundle-cqfm-spreadsheet.xml",
+    "profile-measure-bundle-cqfm-spreadsheet.xml"
   ],
   "canonicalBase": "http://hl7.org/fhir/us/cqfmeasures",
   "source": "cqfmeasures.xml",
@@ -132,17 +135,20 @@
       "source": "library/library-exm146-fhir.json",
       "base": "Library-exm146-FHIR.html"
     },
-    "Library/library-fhir-helpers-FHIR2": {
-      "base": "Library-library-fhir-helpers-FHIR2.html"
-    },
     "Library/fhirhelpers": {
       "source": "library/library-fhirhelpers.json",
-      "base": "Library-fhir-helpers.html"
+      "base": "Library-library-fhir-helpers.html"
+    },
+    "Library/library-fhir-helpers-FHIR2": {
+      "source": "library/library-fhir-helpers-FHIR2.json",
+      "base": "Library-library-fhir-helpers-FHIR2.html"
     },
     "Library/library-fhir-model-definition-FHIR2": {
+      "source": "library/library-fhir-model-definition-FHIR2.json",
       "base": "Library-library-fhir-model-definition-FHIR2.html"
     },
     "Library/library-fhir-model-definition": {
+      "source": "library/library-fhir-model-definition.json",
       "base": "Library-library-fhir-model-definition.html"
     },
     "Library/hospice-fhir": {
@@ -153,15 +159,17 @@
       "source": "library/library-matglobalcommonfunctions-fhir.json",
       "base": "Library-mat-global-common-functions-FHIR.html"
     },
-    "Library/risk-adjustment-FHIR2": {
+    "Library/riskadjustment-fhir2": {
+      "source": "library/library-risk-adjustment-FHIR2.json",
       "base": "Library-library-risk-adjustment-FHIR2.html"
     },
     "Library/supplementaldataelements-fhir": {
       "source": "library/library-supplementaldataelements-fhir.json",
       "base": "Library-supplemental-data-elements-FHIR.html"
     },
-    "Library/library-supplemental-data-elements-FHIR2": {
-      "base": "Library-library-supplemental-data-elements-FHIR2.html"
+    "Library/supplementaldataelements-fhir2": {
+      "source": "library/library-supplementaldataelements-fhir2.json",
+      "base": "Library-library-supplementaldataelements-fhir2.html"
     },
     "Library/terminology-fhir": {
       "source": "library/library-terminology-fhir.json",
@@ -227,6 +235,18 @@
       "defns": "StructureDefinition-cohort-measure-cqfm-definitions.html",
       "base": "StructureDefinition-cohort-measure-cqfm.html"
     },
+    "StructureDefinition/testcase-bundle-cqfm": {
+      "defns": "StructureDefinition-testcase-bundle-cqfm-definitions.html",
+      "base": "StructureDefinition-testcase-bundle-cqfm.html"
+    },
+    "StructureDefinition/measure-bundle-cqfm": {
+      "defns": "StructureDefinition-measure-bundle-cqfm-definitions.html",
+      "base": "StructureDefinition-measure-bundle-cqfm.html"
+    },
+    "StructureDefinition/library-bundle-cqfm": {
+      "defns": "StructureDefinition-library-bundle-cqfm-definitions.html",
+      "base": "StructureDefinition-library-bundle-cqfm.html"
+    },
     "StructureDefinition/cqfm-aggregateMethod": {
       "base": "StructureDefinition-cqfm-aggregateMethod.html"
     },
@@ -257,10 +277,6 @@
     "StructureDefinition/cv-measure-cqfm": {
       "base": "StructureDefinition-cv-measure-cqfm.html"
     },
-    "CodeSystem/improvement-notation": {
-      "source": "codesystem/codesystem-improvement-notation.json",
-      "base": "CodeSystem-improvement-notation.html"
-    },
     "CodeSystem/artifact-comment-type": {
       "source": "codesystem/codesystem-artifact-comment-type.json",
       "base": "CodeSystem-artifact-comment-type.html"
@@ -269,10 +285,6 @@
       "source": "codesystem/codesystem-aggregate-method.json",
       "base": "CodeSystem-aggregate-method.html"
     },
-    "ValueSet/improvement-notation": {
-      "source": "valueset/valueset-improvement-notation.json",
-      "base": "ValueSet-improvement-notation.html"
-    },
     "ValueSet/artifact-comment-type": {
       "source": "valueset/valueset-artifact-comment-type.json",
       "base": "ValueSet-artifact-comment-type.html"

package-list.json

@@ -12,13 +12,20 @@
          "current": true,
 				 "fhirversion": "3.0.2"
       },
+      {
+        "version": "1.1.0",
+        "date": "2019-12-22",
+        "descmd": "STU2 1.1 (v1.1.0)\r\nThis ballot is a minimal update to the STU1 ballot to address the following items:\r\n* Updated to use FHIR R4\r\n* Added artifact packaging guidance and conformance requirements",
+        "desc": "STU2 Ballot for FHIR R4 Version",
+        "path": "http://hl7.org/fhir/us/cqfmeasures/2020Feb",
+        "status": "ballot",
+        "sequence": "STU2",
+        "fhirversion": "4.0.1"
+      },
       {
          "version": "1.0.0",
          "date": "2019-10-30",
-         "descmd": "STU1 1.0 (v1.0.0)\r\n
-         * Clarifications and fixes throughout\r\n
-         \r\n
-         ## Compatible, substantive\r\n* 21181	1..1 relationships\r\n* 21684	Risk adjustment naming conventions? - QM #15\r\n* 21156	Clarify where the risk adjustment variables are stored in the fhir document.\r\n* 21155	Inconsistent conformance requirements (16 and 17).\r\n* 21986	Denominator exceptions in differential table? - QM #136\r\n* 21988	Supporting measurement period without specifying year? - QM #137\r\n* 21145	conformance requirement 13 states that a continuous variable measure SHALL have a criteriaReference extension but the profile has this extension as 0..1 rather than 1..1. Should the profile have 1..1?\r\n* 21187	consider for all slices that aren't \"measure observation\" to make cqfm-criteriaReference and cqfm-aggregateMethod 0..0\r\n* 21183	initial population slice for proportion measure is 1..2. Should be 1..1. (1..2 is for ratio measure).\r\n* 21192	EXM55 library references\r\n* 21178	Does it make sense for the profile itself to specify usage for criteriaReference and aggregateMethod (measure observations)\r\n* 21191	consider slicing content and including the required contentType (text/cql) and optional ones (application/elm+xml, application/elm+json)\r\n* 21984	Require use of specific model? - QM #135\r\n* 21158	Should this be a conformance requirement?\r\n* 21188	consider making cqfm-criteriaReference and cqfm-aggregateMethod 1..1 for \"measure observation\" slice.\r\n* 21186	measure population exclusion slice should be 0..1. population.code for this slice should still be required (1..1)\r\n* 21182	should population.identifier, supplementalData.identifier and stratification.identifier be required?\r\n* 21185	missing denominator exception slice\r\n* 21173	This statement uses SHOULD NOT language but the conformance requirement is SHALL NOT. Recommend rewording for clarity.\r\n* 21146	should conformance requirement 13 require an aggregateMethod extension on the measure observation criteria? It\r\n currently does not.\r\n\r\n## Non-compatible\r\n* 21998	Restrict stratification of ratio measure - QM #142\r\n* 21994	Library namespace guidance - QM #140\r\n* 21056	Disallow the use of strings for membership testing in value sets and code systems\r\n* 21996	Library alias guidance - QM #141",
+         "descmd": "STU1 1.0 (v1.0.0)\r\n* Clarifications and fixes throughout\r\n\r\n## Compatible, substantive\r\n* 21181	1..1 relationships\r\n* 21684	Risk adjustment naming conventions? - QM #15\r\n* 21156	Clarify where the risk adjustment variables are stored in the fhir document.\r\n* 21155	Inconsistent conformance requirements (16 and 17).\r\n* 21986	Denominator exceptions in differential table? - QM #136\r\n* 21988	Supporting measurement period without specifying year? - QM #137\r\n* 21145	conformance requirement 13 states that a continuous variable measure SHALL have a criteriaReference extension but the profile has this extension as 0..1 rather than 1..1. Should the profile have 1..1?\r\n* 21187	consider for all slices that aren't \"measure observation\" to make cqfm-criteriaReference and cqfm-aggregateMethod 0..0\r\n* 21183	initial population slice for proportion measure is 1..2. Should be 1..1. (1..2 is for ratio measure).\r\n* 21192	EXM55 library references\r\n* 21178	Does it make sense for the profile itself to specify usage for criteriaReference and aggregateMethod (measure observations)\r\n* 21191	consider slicing content and including the required contentType (text/cql) and optional ones (application/elm+xml, application/elm+json)\r\n* 21984	Require use of specific model? - QM #135\r\n* 21158	Should this be a conformance requirement?\r\n* 21188	consider making cqfm-criteriaReference and cqfm-aggregateMethod 1..1 for \"measure observation\" slice.\r\n* 21186	measure population exclusion slice should be 0..1. population.code for this slice should still be required (1..1)\r\n* 21182	should population.identifier, supplementalData.identifier and stratification.identifier be required?\r\n* 21185	missing denominator exception slice\r\n* 21173	This statement uses SHOULD NOT language but the conformance requirement is SHALL NOT. Recommend rewording for clarity.\r\n* 21146	should conformance requirement 13 require an aggregateMethod extension on the measure observation criteria? It\r\n currently does not.\r\n\r\n## Non-compatible\r\n* 21998	Restrict stratification of ratio measure - QM #142\r\n* 21994	Library namespace guidance - QM #140\r\n* 21056	Disallow the use of strings for membership testing in value sets and code systems\r\n* 21996	Library alias guidance - QM #141",
          "desc": "STU1 Release for FHIR STU3",
          "path": "http://hl7.org/fhir/us/cqfmeasures/STU1",
          "status": "trial-use",

pages/_includes/data-model-standards-landscape.md

@@ -1,4 +1,4 @@
-#### 1.2.3 Data Model Standards Landscape
+#### 1.3.3 Data Model Standards Landscape
 {: #data-model-standards-landscape}
 
 The quality improvement ecosystem covers every aspect of the healthcare
@@ -66,7 +66,7 @@ measures and decision support artifacts.
 measurement-specific level (in DEQM or HEDIS for example), steps should be taken
 to promote that profile to the broadest consensus group possible.
 
-##### 1.2.3.1 FHIR Version Support
+##### 1.3.3.1 FHIR Version Support
 {: #fhir-version-support}
 
 There are three broadly used and fully published versions of the FHIR
@@ -81,15 +81,11 @@ based on. There is broad vendor support for this version.
 -  **FHIR R4** - This is the first normative release of FHIR, including several of the
 foundational, conformance, and administrative resources going normative.
 
-The implementation guides in this landscape are currently focused on FHIR
-STU3, with the plan to produce R4 versions once the US Core and QI Core profiles
-have been updated to R4.
-
-In addition to _what_ data is reported, use cases frequently require the 
-communication of _when_, _where_ and _how_ to report. See the 
-[Electronic Case Reporting (eCR) implementation guide](http://hl7.org/fhir/us/ecr/2018Sep/design-considerations.html#fhir-design-considerations) 
-for a more complete discussion of these design considerations. We are actively 
-seeking feedback from implementers how this type of information is currently 
-communicated in quality reporting scenarios and when it would be useful to do 
+In addition to _what_ data is reported, use cases frequently require the
+communication of _when_, _where_ and _how_ to report. See the
+[Electronic Case Reporting (eCR) implementation guide](http://hl7.org/fhir/us/ecr/2018Sep/design-considerations.html#fhir-design-considerations)
+for a more complete discussion of these design considerations. We are actively
+seeking feedback from implementers how this type of information is currently
+communicated in quality reporting scenarios and when it would be useful to do
 so electronically.
-{: .stu-note}
+{: .stu-note}

pages/_includes/footer.html

@@ -2,14 +2,14 @@
   <div class="container">  <!-- container -->
    <div class="inner-wrapper">
     <p>
-        &copy; HL7.org {{site.data.info.copyrightyear}} (<a href="{{site.data.fhir.ig.contact[0].telecom[0]}}">{{site.data.fhir.ig.publisher}}</a>). {{site.data.fhir.packageId}}#{{site.data.fhir.igVer}} based on <a style="color: #81BEF7" href="http://hl7.org/fhir/STU3">FHIR v3.0.2</a> generated {{site.data.fhir.genDay}}.
+        &copy; HL7.org {{site.data.info.copyrightyear}} (<a href="{{site.data.fhir.ig.contact[0].telecom[0]}}">{{site.data.fhir.ig.publisher}}</a>). {{site.data.fhir.packageId}}#{{site.data.fhir.igVer}} based on <a style="color: #81BEF7" href="http://hl7.org/fhir/R4">FHIR v4.0.1</a> generated {{site.data.fhir.genDay}}.
         <br/>
         <span>
         Links: <a style="color: #81BEF7" href="index.html">Home</a>
         | <a href="qa.html">QA Report</a>
         | <a style="color: #81BEF7" href="http://hl7.org/fhir/us/cqfmeasures/history.html">Version History</a>
         | <a style="color: #81BEF7" rel="license" href="{{ site.data.fhir.path }}license.html"><img style="border-style: none;" alt="CC0" src="cc0.png"/></a>
-        | <a style="color: #81BEF7" target="_blank" href="http://gforge.hl7.org/gf/project/fhir/tracker/?action=TrackerItemAdd&amp;tracker_id=677">Propose a change <img style="text-align: baseline" src="external.png"/></a>
+        | <a style="color: #81BEF7" target="_blank" href="http://hl7.org/fhir-issues">Propose a change <img style="text-align: baseline" src="external.png"/></a>
         </span>
         <br/>
       </p>

pages/_includes/header.html

@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta charset="UTF-8"/>
-  <title>Quality Measure STU1 for FHIR STU3 Implementation Guide</title>
+  <title>Quality Measure STU2 for FHIR R4 Implementation Guide</title>
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
   <meta name="author" content="http://hl7.org/fhir"/>
@@ -32,5 +32,5 @@
 
 </head>
 <body>
- 
-{% include navbar.html %}
+
+{% include navbar.html %}

pages/_includes/instance-template-valueset.html

@@ -0,0 +1,25 @@
+---
+# jekyll header
+---
+
+{% include header.html %}
+
+{% include container-start.html %}
+
+<h2>Valueset: {{[id]}}</h2>
+
+{% include {{[type]}}-{{[id]}}-summary.xhtml %}
+
+This value set is used by:
+
+{% include {{[type]}}-{{[id]}}-xref.xhtml %}
+
+{% include {{[type]}}-{{[id]}}-cld.xhtml %}
+
+<h3>Expansion</h3>
+
+{% include {{[type]}}-{{[id]}}-expansion.xhtml %}        
+
+{% include container-end.html %}
+
+{% include footer.html %}

pages/_includes/navbar.html

@@ -2,7 +2,7 @@
   <div class="container flex">  <!-- container -->
    <a id="logo" no-external="true" href="http://hl7.org/fhir"><img alt="fhir logo" src="assets/images/fhir-logo-www.png"/> </a>
    <div id="hl7-status">
-    <strong>Quality Measure STU1 for FHIR STU3 Implementation Guide</strong>
+    <strong>Quality Measure STU2 for FHIR R4 Implementation Guide</strong>
    </div>
 
    <div id="hl7-nav">
@@ -34,6 +34,7 @@
         <li><a href="introduction.html" class="item">Introduction</a></li>
         <li><a href="measure-conformance.html" class="item">eCQMs</a></li>
         <li><a href="using-cql.html" class="item">Using CQL</a></li>
+        <li><a href="packaging.html" class="item">Packaging</a></li>
         <li><a href="examples.html" class="item">Examples</a></li>
         <li><a href="profiles.html" class="item">Profiles</a></li>
         <li><a href="extensions.html" class="item">Extensions</a></li>