Merge latest from upstream

CRD-DTR/HomeOxygenTherapy/R4/files/HomeOxygenTherapyRule-0.1.0.cql

@@ -4,12 +4,13 @@ include FHIRHelpers version '4.0.0' called FHIRHelpers
 
 parameter Patient Patient
 parameter device_request DeviceRequest
+parameter Coverage Coverage
 
 define "Age":
     AgeInYears()
 
 define RULE_APPLIES:
-    "Age" > 0
+    "Age" > 0 and Coverage.class.value = 'Medicare Part A'
 
 define PRIORAUTH_REQUIRED:
   false 

CRD-DTR/HomeOxygenTherapy/R4/files/Questions-HomeOxygenTherapyAdditionalAdaptive.json

@@ -105,6 +105,20 @@
                         }
                     ]
                 },
+                {
+                    "linkId": "SQ-1.c",
+                    "text": "SQ-1.c: Form Expiration Date",
+                    "type": "date",
+                    "extension": [
+                        {
+                            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+                            "valueExpression": {
+                                "language": "text/cql",
+                                "expression": "Today() + 14 day"
+                            }
+                        }
+                    ]
+                },
                 {
                     "linkId": "1.1",
                     "type": "display",

CRD-DTR/HomeOxygenTherapy/R4/resources/Questionnaire-R4-HomeOxygenTherapy.json

@@ -628,6 +628,20 @@
       ],
       "type": "display",
       "text": "This is a placeholder for Provider Signature"
+    },
+    {
+      "linkId": "7",
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+          "valueExpression": {
+            "language": "text/cql",
+            "expression": "Today() + 14 day"
+          }
+        }
+      ],
+      "type": "date",
+      "text": "Form Expiration Date"
     }
   ]
 }