Merge pull request #117 from cqframework/develop

Develop
cqframework · May 22, 2020 · de8c44b · de8c44b
2 parents 36b6c32 + 33c069a
commit de8c44b
Show file tree

Hide file tree

Showing 108 changed files with 685 additions and 739 deletions.
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.0'
+library OpioidCDSREC04 version '1.2.1'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.0' called Common
-include OpioidCDSRoutines version '1.2.0' called Routines
+include OpioidCDSCommon version '1.2.1' called Common
+include OpioidCDSRoutines version '1.2.1' 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.0",
+  "version": "1.2.1",
   "name": "PlanDefinition_Recommendation_4",
   "title": "PlanDefinition - CDC Opioid Prescribing Guideline Recommendation #4",
   "type": {

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.0'
+library OpioidCDSREC04PatientView version '1.2.1'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.0' called Common
-include OpioidCDSRoutines version '1.2.0' called Routines
+include OpioidCDSCommon version '1.2.1' called Common
+include OpioidCDSRoutines version '1.2.1' 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.0",
+  "version": "1.2.1",
   "name": "PlanDefinition_Recommendation_4",
   "title": "PlanDefinition - CDC Opioid Prescribing Guideline Recommendation #4 (patient-view)",
   "type": {

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.0'
+library OpioidCDSREC05 version '1.2.1'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.0' called Common
-include OpioidCDSRoutines version '1.2.0' called Routines
+include OpioidCDSCommon version '1.2.1' called Common
+include OpioidCDSRoutines version '1.2.1' 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.0",
+  "version": "1.2.1",
   "name": "PlanDefinition_Recommendation_5",
   "title": "PlanDefinition - CDC Opioid Prescribing Guideline Recommendation #5",
   "type": {

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.0'
+library OpioidCDSREC07 version '1.2.1'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.0' called Common
-include OpioidCDSRoutines version '1.2.0' called Routines
+include OpioidCDSCommon version '1.2.1' called Common
+include OpioidCDSRoutines version '1.2.1' 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,6 +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",
   "name": "ActivityDefinition - Recommendation #7 Risk Assessment ProcedureRequest",
   "title": "CDC Opioid Prescribing Guideline Recommendation #7 - Risk Assessment ProcedureRequest",
   "status": "draft",
@@ -80,4 +81,4 @@
       }
     ]
   }
-}
+}
diff --git a/bundles/OpioidCDSREC07/OpioidCDSREC07-files/library-OpioidCDSREC07.json b/bundles/OpioidCDSREC07/OpioidCDSREC07-files/library-OpioidCDSREC07.json
diff --git a/bundles/OpioidCDSREC07/OpioidCDSREC07-files/library-deps-OpioidCDSREC07-bundle.json b/bundles/OpioidCDSREC07/OpioidCDSREC07-files/library-deps-OpioidCDSREC07-bundle.json
diff --git a/bundles/OpioidCDSREC07/OpioidCDSREC07-files/plandefinition-OpioidCDSREC07.json b/bundles/OpioidCDSREC07/OpioidCDSREC07-files/plandefinition-OpioidCDSREC07.json
@@ -2,7 +2,7 @@
   "resourceType": "PlanDefinition",
   "id": "opioidcds-07",
   "url": "http://fhir.org/guides/cdc/opioid-cds/PlanDefinition/opioidcds-07",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "name": "PlanDefinition_Recommendation_7",
   "title": "PlanDefinition - CDC Opioid Prescribing Guideline Recommendation #7",
   "type": {

diff --git a/bundles/OpioidCDSREC08/OpioidCDSREC08-bundle.json b/bundles/OpioidCDSREC08/OpioidCDSREC08-bundle.json
diff --git a/bundles/OpioidCDSREC08/OpioidCDSREC08-files/OpioidCDSREC08.cql b/bundles/OpioidCDSREC08/OpioidCDSREC08-files/OpioidCDSREC08.cql
@@ -1,11 +1,11 @@
-library OpioidCDSREC08 version '1.2.0'
+library OpioidCDSREC08 version '1.2.1'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.0' called Common
-include OpioidCDSCommonConfig version '1.2.0' called Config
-include OpioidCDSRoutines version '1.2.0' called Routines
+include OpioidCDSCommon version '1.2.1' called Common
+include OpioidCDSCommonConfig version '1.2.1' called Config
+include OpioidCDSRoutines version '1.2.1' called Routines
 
 /*
 **

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

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

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

diff --git a/bundles/OpioidCDSREC10PatientView/OpioidCDSREC10PatientView-bundle.json b/bundles/OpioidCDSREC10PatientView/OpioidCDSREC10PatientView-bundle.json
diff --git a/...s/OpioidCDSREC10PatientView/OpioidCDSREC10PatientView-files/OpioidCDSREC10PatientView.cql b/...s/OpioidCDSREC10PatientView/OpioidCDSREC10PatientView-files/OpioidCDSREC10PatientView.cql
@@ -1,10 +1,10 @@
-library OpioidCDSREC10PatientView version '1.2.0'
+library OpioidCDSREC10PatientView version '1.2.1'
 
 using FHIR version '3.0.0'
 
 include FHIRHelpers version '3.0.0' called FHIRHelpers
-include OpioidCDSCommon version '1.2.0' called Common
-include OpioidCDSRoutines version '1.2.0' called Routines
+include OpioidCDSCommon version '1.2.1' called Common
+include OpioidCDSRoutines version '1.2.1' called Routines
 
 code "Urine Drug Screening": '310627008' from Common.SNOMED display 'Urine drug screening (procedure)'
 

diff --git a/...DSREC10PatientView/OpioidCDSREC10PatientView-files/library-OpioidCDSREC10PatientView.json b/...DSREC10PatientView/OpioidCDSREC10PatientView-files/library-OpioidCDSREC10PatientView.json