Merge pull request #127 from cqframework/develop

1.2.2 Release Candidate
cqframework · Jun 17, 2020 · 0360ef5 · 0360ef5
2 parents de8c44b + ddb6353
commit 0360ef5
Show file tree

Hide file tree

Showing 165 changed files with 57,814 additions and 27,916 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,13 +4,10 @@
 /temp
 .DS_Store
 .idea/
-/resources/ig-expansion-parameters.json
-/resources/ig-validation-parameters.json
-/resources/ig-new.json
-/resources/ig-new.xml
 /org.hl7.fhir.publisher.jar
 template
 input-cache/*
+!/input-cache/txCache
 !/input-cache/txcache
 input/ig-expansion-parameters.json
 input/ig-new.json

diff --git a/...eset/valueset-opioid-urine-screening.json → ...lary/valueset-opioid-urine-screening.json b/...eset/valueset-opioid-urine-screening.json → ...lary/valueset-opioid-urine-screening.json
diff --git a/bundles/OpioidCDSREC04/OpioidCDSREC04-bundle.json b/bundles/OpioidCDSREC04/OpioidCDSREC04-bundle.json
diff --git a/bundles/OpioidCDSREC04/OpioidCDSREC04-files/OpioidCDSREC04.cql b/bundles/OpioidCDSREC04/OpioidCDSREC04-files/OpioidCDSREC04.cql
@@ -1,10 +1,10 @@
-library OpioidCDSREC04 version '1.2.1'
+library OpioidCDSREC04 version '1.2.2'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.1' called Common
-include OpioidCDSRoutines version '1.2.1' called Routines
+include OpioidCDSCommon version '1.2.2' called Common
+include OpioidCDSRoutines version '1.2.2' called Routines
 
 /*
 **

diff --git a/bundles/OpioidCDSREC04/OpioidCDSREC04-files/library-OpioidCDSREC04.json b/bundles/OpioidCDSREC04/OpioidCDSREC04-files/library-OpioidCDSREC04.json
diff --git a/bundles/OpioidCDSREC04/OpioidCDSREC04-files/library-deps-OpioidCDSREC04-bundle.json b/bundles/OpioidCDSREC04/OpioidCDSREC04-files/library-deps-OpioidCDSREC04-bundle.json
diff --git a/bundles/OpioidCDSREC04/OpioidCDSREC04-files/plandefinition-OpioidCDSREC04.json b/bundles/OpioidCDSREC04/OpioidCDSREC04-files/plandefinition-OpioidCDSREC04.json
@@ -2,7 +2,7 @@
   "resourceType": "PlanDefinition",
   "id": "opioidcds-04",
   "url": "http://fhir.org/guides/cdc/opioid-cds/PlanDefinition/opioidcds-04",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "name": "PlanDefinition_Recommendation_4",
   "title": "PlanDefinition - CDC Opioid Prescribing Guideline Recommendation #4",
   "type": {

diff --git a/bundles/OpioidCDSREC04/OpioidCDSREC04-files/valuesets-OpioidCDSREC04-bundle.json b/bundles/OpioidCDSREC04/OpioidCDSREC04-files/valuesets-OpioidCDSREC04-bundle.json
@@ -16962,7 +16962,7 @@
         "experimental": true,
         "date": "2020-03-26T17:39:09-06:00",
         "publisher": "Centers for Disease Control and Prevention (CDC)",
-        "description": "Individual tests and panels of tests of urine for opioids",
+        "description": "Individual tests and panels of tests of urine for opioids. NOTE: The explicit exclusion of code LOINC|19300-3 is a workaround for an issue with retrieving observations of that code at some implementation sites.",
         "jurisdiction": [
           {
             "coding": [
@@ -17042,6 +17042,17 @@
                 }
               ]
             }
+          ],
+          "exclude": [
+            {
+              "system": "http://loinc.org",
+              "concept": [
+                {
+                  "code": "19300-3",
+                  "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:Confirm"
+                }
+              ]
+            }
           ]
         },
         "expansion": {
@@ -18769,12 +18780,6 @@
               "code": "19138-7",
               "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:"
             },
-            {
-              "system": "http://loinc.org",
-              "version": "2.67",
-              "code": "19300-3",
-              "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:Confirm"
-            },
             {
               "system": "http://loinc.org",
               "version": "2.67",

diff --git a/bundles/OpioidCDSREC04PatientView/OpioidCDSREC04PatientView-bundle.json b/bundles/OpioidCDSREC04PatientView/OpioidCDSREC04PatientView-bundle.json
diff --git a/...s/OpioidCDSREC04PatientView/OpioidCDSREC04PatientView-files/OpioidCDSREC04PatientView.cql b/...s/OpioidCDSREC04PatientView/OpioidCDSREC04PatientView-files/OpioidCDSREC04PatientView.cql
@@ -1,10 +1,10 @@
-library OpioidCDSREC04PatientView version '1.2.1'
+library OpioidCDSREC04PatientView version '1.2.2'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.1' called Common
-include OpioidCDSRoutines version '1.2.1' called Routines
+include OpioidCDSCommon version '1.2.2' called Common
+include OpioidCDSRoutines version '1.2.2' called Routines
 
 /*
 **

diff --git a/...DSREC04PatientView/OpioidCDSREC04PatientView-files/library-OpioidCDSREC04PatientView.json b/...DSREC04PatientView/OpioidCDSREC04PatientView-files/library-OpioidCDSREC04PatientView.json
diff --git a/...ntView/OpioidCDSREC04PatientView-files/library-deps-OpioidCDSREC04PatientView-bundle.json b/...ntView/OpioidCDSREC04PatientView-files/library-deps-OpioidCDSREC04PatientView-bundle.json
diff --git a/...PatientView/OpioidCDSREC04PatientView-files/plandefinition-OpioidCDSREC04PatientView.json b/...PatientView/OpioidCDSREC04PatientView-files/plandefinition-OpioidCDSREC04PatientView.json
@@ -2,7 +2,7 @@
   "resourceType": "PlanDefinition",
   "id": "opioidcds-04-patient-view",
   "url": "http://fhir.org/guides/cdc/opioid-cds/PlanDefinition/opioidcds-04-patient-view",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "name": "PlanDefinition_Recommendation_4",
   "title": "PlanDefinition - CDC Opioid Prescribing Guideline Recommendation #4 (patient-view)",
   "type": {

diff --git a/...tientView/OpioidCDSREC04PatientView-files/valuesets-OpioidCDSREC04PatientView-bundle.json b/...tientView/OpioidCDSREC04PatientView-files/valuesets-OpioidCDSREC04PatientView-bundle.json
@@ -16962,7 +16962,7 @@
         "experimental": true,
         "date": "2020-03-26T17:39:09-06:00",
         "publisher": "Centers for Disease Control and Prevention (CDC)",
-        "description": "Individual tests and panels of tests of urine for opioids",
+        "description": "Individual tests and panels of tests of urine for opioids. NOTE: The explicit exclusion of code LOINC|19300-3 is a workaround for an issue with retrieving observations of that code at some implementation sites.",
         "jurisdiction": [
           {
             "coding": [
@@ -17042,6 +17042,17 @@
                 }
               ]
             }
+          ],
+          "exclude": [
+            {
+              "system": "http://loinc.org",
+              "concept": [
+                {
+                  "code": "19300-3",
+                  "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:Confirm"
+                }
+              ]
+            }
           ]
         },
         "expansion": {
@@ -18769,12 +18780,6 @@
               "code": "19138-7",
               "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:"
             },
-            {
-              "system": "http://loinc.org",
-              "version": "2.67",
-              "code": "19300-3",
-              "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:Confirm"
-            },
             {
               "system": "http://loinc.org",
               "version": "2.67",

diff --git a/bundles/OpioidCDSREC05/OpioidCDSREC05-bundle.json b/bundles/OpioidCDSREC05/OpioidCDSREC05-bundle.json
diff --git a/bundles/OpioidCDSREC05/OpioidCDSREC05-files/OpioidCDSREC05.cql b/bundles/OpioidCDSREC05/OpioidCDSREC05-files/OpioidCDSREC05.cql
@@ -1,10 +1,10 @@
-library OpioidCDSREC05 version '1.2.1'
+library OpioidCDSREC05 version '1.2.2'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.1' called Common
-include OpioidCDSRoutines version '1.2.1' called Routines
+include OpioidCDSCommon version '1.2.2' called Common
+include OpioidCDSRoutines version '1.2.2' called Routines
 
 /*
 **

diff --git a/bundles/OpioidCDSREC05/OpioidCDSREC05-files/library-OpioidCDSREC05.json b/bundles/OpioidCDSREC05/OpioidCDSREC05-files/library-OpioidCDSREC05.json
diff --git a/bundles/OpioidCDSREC05/OpioidCDSREC05-files/library-deps-OpioidCDSREC05-bundle.json b/bundles/OpioidCDSREC05/OpioidCDSREC05-files/library-deps-OpioidCDSREC05-bundle.json
diff --git a/bundles/OpioidCDSREC05/OpioidCDSREC05-files/plandefinition-OpioidCDSREC05.json b/bundles/OpioidCDSREC05/OpioidCDSREC05-files/plandefinition-OpioidCDSREC05.json
@@ -2,7 +2,7 @@
   "resourceType": "PlanDefinition",
   "id": "opioidcds-05",
   "url": "http://fhir.org/guides/cdc/opioid-cds/PlanDefinition/opioidcds-05",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "name": "PlanDefinition_Recommendation_5",
   "title": "PlanDefinition - CDC Opioid Prescribing Guideline Recommendation #5",
   "type": {

diff --git a/bundles/OpioidCDSREC05/OpioidCDSREC05-files/valuesets-OpioidCDSREC05-bundle.json b/bundles/OpioidCDSREC05/OpioidCDSREC05-files/valuesets-OpioidCDSREC05-bundle.json
@@ -16962,7 +16962,7 @@
         "experimental": true,
         "date": "2020-03-26T17:39:09-06:00",
         "publisher": "Centers for Disease Control and Prevention (CDC)",
-        "description": "Individual tests and panels of tests of urine for opioids",
+        "description": "Individual tests and panels of tests of urine for opioids. NOTE: The explicit exclusion of code LOINC|19300-3 is a workaround for an issue with retrieving observations of that code at some implementation sites.",
         "jurisdiction": [
           {
             "coding": [
@@ -17042,6 +17042,17 @@
                 }
               ]
             }
+          ],
+          "exclude": [
+            {
+              "system": "http://loinc.org",
+              "concept": [
+                {
+                  "code": "19300-3",
+                  "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:Confirm"
+                }
+              ]
+            }
           ]
         },
         "expansion": {
@@ -18769,12 +18780,6 @@
               "code": "19138-7",
               "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:"
             },
-            {
-              "system": "http://loinc.org",
-              "version": "2.67",
-              "code": "19300-3",
-              "display": "Opiates cutoff:MCnc:Pt:Urine:Qn:Confirm"
-            },
             {
               "system": "http://loinc.org",
               "version": "2.67",

diff --git a/bundles/OpioidCDSREC07/OpioidCDSREC07-bundle.json b/bundles/OpioidCDSREC07/OpioidCDSREC07-bundle.json
diff --git a/bundles/OpioidCDSREC07/OpioidCDSREC07-files/OpioidCDSREC07.cql b/bundles/OpioidCDSREC07/OpioidCDSREC07-files/OpioidCDSREC07.cql
@@ -1,10 +1,10 @@
-library OpioidCDSREC07 version '1.2.1'
+library OpioidCDSREC07 version '1.2.2'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.1' called Common
-include OpioidCDSRoutines version '1.2.1' called Routines
+include OpioidCDSCommon version '1.2.2' called Common
+include OpioidCDSRoutines version '1.2.2' called Routines
 
 /*
 **

diff --git a/...idCDSREC07/OpioidCDSREC07-files/activitydefinition-opioidcds-risk-assessment-request.json b/...idCDSREC07/OpioidCDSREC07-files/activitydefinition-opioidcds-risk-assessment-request.json
@@ -2,7 +2,7 @@
   "resourceType": "ActivityDefinition",
   "id": "opioidcds-risk-assessment-request",
   "url": "http://fhir.org/guides/cdc/opioid-cds/ActivityDefinition/opioidcds-risk-assessment-request",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "name": "ActivityDefinition - Recommendation #7 Risk Assessment ProcedureRequest",
   "title": "CDC Opioid Prescribing Guideline Recommendation #7 - Risk Assessment ProcedureRequest",
   "status": "draft",