Merge branch 'master' of https://github.com/HL7/cqf-measures

HL7 · Dec 6, 2019 · 71b3a65 · 71b3a65
2 parents aa2b932 + 9d74ab1
commit 71b3a65
Show file tree

Hide file tree

Showing 85 changed files with 3,632 additions and 84,871 deletions.
diff --git a/ig.json b/ig.json
@@ -16,7 +16,7 @@
     "txCache": "txCache",
     "history": "http://hl7.org/fhir/us/cqfmeasures/history.html"
   },
-  "version": "3.0.1",
+  "version": "3.0.2",
   "fixed-business-version": "1.0.0",
   "license": "CC0-1.0",
   "logging": ["init", "progress", "context", "html", "tx"],
@@ -100,65 +100,80 @@
   "canonicalBase": "http://hl7.org/fhir/us/cqfmeasures",
   "source": "cqfmeasures.xml",
   "resources": {
-    "Library/library-adult-outpatient-encounters-FHIR": {
-      "base": "Library-library-adult-outpatient-encounters-FHIR.html"
+    "Library/adultoutpatientencounters-fhir": {
+      "source": "library/library-adultoutpatientencounters-fhir.json",
+      "base": "Library-adult-outpatient-encounters-FHIR.html"
     },
-    "Library/library-common-FHIR": {
-      "base": "Library-library-common-FHIR.html"
+    "Library/common-fhir": {
+      "source": "library/library-common-fhir.json",
+      "base": "Library-common-FHIR.html"
     },
-    "Library/library-exm-logic": {
-      "base": "Library-library-exm-logic.html"
+    "Library/exm-logic": {
+      "source": "library/library-exm-logic.json",
+      "base": "Library-exm-logic.html"
     },
-    "Library/library-exm55-FHIR": {
-      "base": "Library-library-exm55-FHIR.html"
+    "Library/exm55-fhir": {
+      "source": "library/library-exm55-fhir.json",
+      "base": "Library-exm55-FHIR.html"
     },
-    "Library/library-exm124-FHIR": {
-      "base": "Library-library-exm124-FHIR.html"
+    "Library/exm124-fhir": {
+      "source": "library/library-exm124-fhir.json",
+      "base": "Library-exm124-FHIR.html"
     },
-    "Library/library-exm125-FHIR": {
-      "base": "Library-library-exm125-FHIR.html"
+    "Library/exm125-fhir": {
+      "source": "library/library-exm125-fhir.json",
+      "base": "Library-exm125-FHIR.html"
     },
-    "Library/library-exm130-FHIR": {
-      "base": "Library-library-exm130-FHIR.html"
+    "Library/exm130-fhir": {
+      "source": "library/library-exm130-fhir.json",
+      "base": "Library-exm130-FHIR.html"
     },
-    "Library/library-exm146-FHIR": {
-      "base": "Library-library-exm146-FHIR.html"
+    "Library/exm146-fhir": {
+      "source": "library/library-exm146-fhir.json",
+      "base": "Library-exm146-FHIR.html"
     },
     "Library/library-fhir-helpers-FHIR2": {
       "base": "Library-library-fhir-helpers-FHIR2.html"
     },
-    "Library/library-fhir-helpers": {
-      "base": "Library-library-fhir-helpers.html"
+    "Library/fhirhelpers": {
+      "source": "library/library-fhirhelpers.json",
+      "base": "Library-fhir-helpers.html"
     },
     "Library/library-fhir-model-definition-FHIR2": {
       "base": "Library-library-fhir-model-definition-FHIR2.html"
     },
     "Library/library-fhir-model-definition": {
       "base": "Library-library-fhir-model-definition.html"
     },
-    "Library/library-hospice-FHIR": {
-      "base": "Library-library-hospice-FHIR.html"
+    "Library/hospice-fhir": {
+      "source": "library/library-hospice-fhir.json",
+      "base": "Library-hospice-FHIR.html"
     },
-    "Library/library-mat-global-common-functions-FHIR": {
-      "base": "Library-library-mat-global-common-functions-FHIR.html"
+    "Library/matglobalcommonfunctions-fhir": {
+      "source": "library/library-matglobalcommonfunctions-fhir.json",
+      "base": "Library-mat-global-common-functions-FHIR.html"
     },
     "Library/risk-adjustment-FHIR2": {
       "base": "Library-library-risk-adjustment-FHIR2.html"
     },
-    "Library/library-supplemental-data-elements-FHIR": {
-      "base": "Library-library-supplemental-data-elements-FHIR.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/library-terminology-FHIR": {
-      "base": "Library-library-terminology-FHIR.html"
+    "Library/terminology-fhir": {
+      "source": "library/library-terminology-fhir.json",
+      "base": "Library-terminology-FHIR.html"
     },
-    "Library/library-vte-1-FHIR": {
-      "base": "Library-library-vte-1-FHIR.html"
+    "Library/vte-1-fhir": {
+      "source": "library/library-vte-1-fhir.json",
+      "base": "Library-vte-1-FHIR.html"
     },
-    "Library/library-vte-icu-FHIR": {
-      "base": "Library-library-vte-icu-FHIR.html"
+    "Library/vteicu-fhir": {
+      "source": "library/library-vteicu-fhir.json",
+      "base": "Library-vte-icu-FHIR.html"
     },
     "Measure/measure-exm": {
       "base": "Measure-measure-exm.html"

diff --git a/org.hl7.fhir.publisher.jar b/org.hl7.fhir.publisher.jar
diff --git a/package-list.json b/package-list.json
@@ -10,16 +10,20 @@
          "path": "http://build.fhir.org/ig/HL7/cqf-measures",
          "status": "ci-build",
          "current": true,
-				 "fhirversion": "3.0.1"
+				 "fhirversion": "3.0.2"
       },
       {
          "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",
          "desc": "STU1 Release for FHIR STU3",
          "path": "http://hl7.org/fhir/us/cqfmeasures/STU1",
          "status": "trial-use",
          "sequence": "STU1",
-				 "fhirversion": "3.0.1"
+				 "fhirversion": "3.0.2"
       },
       {
          "version": "0.1.0",

diff --git a/pages/_includes/footer.html b/pages/_includes/footer.html
@@ -2,18 +2,18 @@
   <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.1</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/STU3">FHIR v3.0.2</a> generated {{site.data.fhir.genDay}}.
         <br/>
         <span>
-        Links: <a style="color: #81BEF7" href="index.html">Home</a> 
+        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" 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>
         </span>
         <br/>
       </p>
-      
+
    </div>  <!-- /inner-wrapper -->
   </div>  <!-- /container -->
  </div>  <!-- /segment-footer -->
@@ -39,4 +39,4 @@
   <!-- Analytics Below
 ================================================== -->
 </body>
-</html>
+</html>
diff --git a/pages/_includes/library-cqfm-ex.html b/pages/_includes/library-cqfm-ex.html
@@ -1,35 +1,35 @@
 <tr>
-    <td><a href="Library-library-common-FHIR.html">Example Common Library</a></td>
+    <td><a href="Library-common-FHIR.html">Example Common Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-supplemental-data-elements-FHIR.html">Supplemental Data Elements Shared Library</a></td>
+    <td><a href="Library-supplemental-data-elements-FHIR.html">Supplemental Data Elements Shared Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-mat-global-common-functions-FHIR.html">Global Common Functions Shared Library</a></td>
+    <td><a href="Library-mat-global-common-functions-FHIR.html">Global Common Functions Shared Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-adult-outpatient-encounters-FHIR.html">Adult Outpatient Encounters Shared Library</a></td>
+    <td><a href="Library-adult-outpatient-encounters-FHIR.html">Adult Outpatient Encounters Shared Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-hospice-FHIR.html">Hospice Shared Library</a></td>
+    <td><a href="Library-hospice-FHIR.html">Hospice Shared Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-exm55-FHIR.html">Continuous Variable Measure Library</a></td>
+    <td><a href="Library-exm55-FHIR.html">Continuous Variable Measure Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-exm124-FHIR.html">Patient-based Proportion Measure Library</a></td>
+    <td><a href="Library-exm124-FHIR.html">Patient-based Proportion Measure Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-exm146-FHIR.html">Encounter-based Proportion Measure Library</a></td>
+    <td><a href="Library-exm146-FHIR.html">Encounter-based Proportion Measure Library</a></td>
 </tr>
 <tr>
     <td><a href="Library-library-risk-adjustment-FHIR2.html">Risk Adjustment Measure Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-terminology-FHIR.html">Cohort Measure Library</a></td>
+    <td><a href="Library-terminology-FHIR.html">Cohort Measure Library</a></td>
 </tr>
 <tr>
-    <td><a href="Library-library-vte-1-FHIR.html">Hospital Measure Library</a></td>
+    <td><a href="Library-vte-1-FHIR.html">Hospital Measure Library</a></td>
 </tr>