Merge pull request #231 from cqframework/develop

Develop
cqframework · May 13, 2022 · 78b2b5e · 78b2b5e
2 parents a5f62a2 + 35f02ac
commit 78b2b5e
Show file tree

Hide file tree

Showing 8 changed files with 16,030 additions and 8,770 deletions.
diff --git a/bundles/opioid-cds-terminology-bundle.json b/bundles/opioid-cds-terminology-bundle.json
diff --git a/bundles/plandefinition/OpioidCDSREC10PatientView/OpioidCDSREC10PatientView-bundle.json b/bundles/plandefinition/OpioidCDSREC10PatientView/OpioidCDSREC10PatientView-bundle.json
diff --git a/.../OpioidCDSREC10PatientView/OpioidCDSREC10PatientView-files/OpioidCDSREC10PatientView.json b/.../OpioidCDSREC10PatientView/OpioidCDSREC10PatientView-files/OpioidCDSREC10PatientView.json
@@ -249,18 +249,12 @@
     "type": "string"
   } ],
   "dataRequirement": [ {
-    "extension": [ {
-      "url": "http://hl7.org/fhir/tools/StructureDefinition/original-resource-name",
-      "valueCode": "Patient"
-    } ],
-    "type": "Patient"
-  }, {
     "extension": [ {
       "url": "http://hl7.org/fhir/tools/StructureDefinition/original-resource-name",
       "valueCode": "MedicationRequest"
     } ],
     "type": "MedicationRequest",
-    "mustSupport": [ "status", "authoredOn", "medication", "category", "medication.reference", "id", "intent", "subject", "recorder", "dosageInstruction", "dispenseRequest" ],
+    "mustSupport": [ "recorder", "dosageInstruction", "authoredOn", "dispenseRequest", "subject", "medication.reference", "medication", "id", "category", "intent", "status" ],
     "codeFilter": [ {
       "path": "status",
       "valueSetReference": {
@@ -283,7 +277,7 @@
       "valueCode": "MedicationRequest"
     } ],
     "type": "MedicationRequest",
-    "mustSupport": [ "status", "authoredOn", "medication", "category", "medication.reference", "id", "intent", "subject", "recorder", "dosageInstruction", "dispenseRequest" ],
+    "mustSupport": [ "recorder", "dosageInstruction", "authoredOn", "dispenseRequest", "subject", "medication.reference", "medication", "id", "category", "intent", "status" ],
     "codeFilter": [ {
       "path": "status",
       "valueSetReference": {
@@ -332,23 +326,30 @@
   }, {
     "extension": [ {
       "url": "http://hl7.org/fhir/tools/StructureDefinition/original-resource-name",
-      "valueCode": "Observation"
+      "valueCode": "Procedure"
     } ],
-    "type": "Observation",
-    "mustSupport": [ "category" ],
+    "type": "Procedure",
+    "mustSupport": [ "code", "status.value", "status" ],
     "codeFilter": [ {
-      "path": "category",
+      "path": "code",
       "valueSetReference": {
-        "reference": "http://fhir.org/guides/cdc/opioid-cds/ValueSet/observation-category-laboratory"
+        "reference": "http://fhir.org/guides/cdc/opioid-cds/ValueSet/hospice-procedure"
       }
     } ]
+  }, {
+    "extension": [ {
+      "url": "http://hl7.org/fhir/tools/StructureDefinition/original-resource-name",
+      "valueCode": "Encounter"
+    } ],
+    "type": "Encounter",
+    "mustSupport": [ "period.start", "period", "status.value", "status" ]
   }, {
     "extension": [ {
       "url": "http://hl7.org/fhir/tools/StructureDefinition/original-resource-name",
       "valueCode": "Observation"
     } ],
     "type": "Observation",
-    "mustSupport": [ "category", "code" ],
+    "mustSupport": [ "code", "category" ],
     "codeFilter": [ {
       "path": "category",
       "valueSetReference": {
@@ -361,7 +362,7 @@
       "valueCode": "Observation"
     } ],
     "type": "Observation",
-    "mustSupport": [ "category", "code" ],
+    "mustSupport": [ "code", "category" ],
     "codeFilter": [ {
       "path": "category",
       "valueSetReference": {
@@ -374,7 +375,7 @@
       "valueCode": "Observation"
     } ],
     "type": "Observation",
-    "mustSupport": [ "category", "code" ],
+    "mustSupport": [ "code", "category" ],
     "codeFilter": [ {
       "path": "category",
       "valueSetReference": {
@@ -384,30 +385,29 @@
   }, {
     "extension": [ {
       "url": "http://hl7.org/fhir/tools/StructureDefinition/original-resource-name",
-      "valueCode": "Procedure"
+      "valueCode": "Patient"
     } ],
-    "type": "Procedure",
-    "mustSupport": [ "code", "status", "status.value" ],
-    "codeFilter": [ {
-      "path": "code",
-      "valueSetReference": {
-        "reference": "http://fhir.org/guides/cdc/opioid-cds/ValueSet/hospice-procedure"
-      }
-    } ]
+    "type": "Patient"
   }, {
     "extension": [ {
       "url": "http://hl7.org/fhir/tools/StructureDefinition/original-resource-name",
-      "valueCode": "Encounter"
+      "valueCode": "Observation"
     } ],
-    "type": "Encounter",
-    "mustSupport": [ "period", "period.start", "status", "status.value" ]
+    "type": "Observation",
+    "mustSupport": [ "category" ],
+    "codeFilter": [ {
+      "path": "category",
+      "valueSetReference": {
+        "reference": "http://fhir.org/guides/cdc/opioid-cds/ValueSet/observation-category-laboratory"
+      }
+    } ]
   }, {
     "extension": [ {
       "url": "http://hl7.org/fhir/tools/StructureDefinition/original-resource-name",
       "valueCode": "Observation"
     } ],
     "type": "Observation",
-    "mustSupport": [ "category", "code" ],
+    "mustSupport": [ "code", "category" ],
     "codeFilter": [ {
       "path": "category",
       "valueSetReference": {
@@ -420,7 +420,7 @@
       "valueCode": "Observation"
     } ],
     "type": "Observation",
-    "mustSupport": [ "category", "code" ],
+    "mustSupport": [ "code", "category" ],
     "codeFilter": [ {
       "path": "category",
       "valueSetReference": {
@@ -433,7 +433,7 @@
       "valueCode": "Observation"
     } ],
     "type": "Observation",
-    "mustSupport": [ "category", "code" ],
+    "mustSupport": [ "code", "category" ],
     "codeFilter": [ {
       "path": "category",
       "valueSetReference": {