Associate variables to appropriate sub-questionnaires and add assembl…

…eContext as required
aehrc · Nov 7, 2023 · 285ad92 · 285ad92
1 parent 2ed8fbf
commit 285ad92
Show file tree

Hide file tree

Showing 70 changed files with 784 additions and 207 deletions.
diff --git a/fsh-generated/resources/ImplementationGuide-csiro.fhir.au.smartforms.json b/fsh-generated/resources/ImplementationGuide-csiro.fhir.au.smartforms.json
@@ -35,7 +35,7 @@
     },
     {
       "packageId": "hl7.fhir.uv.sdc",
-      "version": "current",
+      "version": "3.0.0",
       "uri": "http://hl7.org/fhir/uv/sdc/ImplementationGuide/hl7.fhir.uv.sdc",
       "id": "hl7_fhir_uv_sdc"
     }

diff --git a/fsh-generated/resources/Questionnaire-AboutTheHealthCheck.json b/fsh-generated/resources/Questionnaire-AboutTheHealthCheck.json
@@ -283,6 +283,10 @@
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assemble-expectation",
       "valueCode": "assemble-child"
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
       "extension": [
@@ -322,6 +326,22 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "QuestionnaireResponseLatestCompleted",
+        "language": "application/x-fhir-query",
+        "expression": "QuestionnaireResponse?status=completed&_count=1&_sort=-authored&patient={{%patient.id}}"
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "QuestionnaireResponseLatest",
+        "language": "application/x-fhir-query",
+        "expression": "QuestionnaireResponse?_count=1&_sort=-authored&patient={{%patient.id}}"
+      }
     }
   ],
   "name": "AboutTheHealthCheck",

diff --git a/fsh-generated/resources/Questionnaire-AbsoluteCVDRiskCalculation.json b/fsh-generated/resources/Questionnaire-AbsoluteCVDRiskCalculation.json
@@ -583,6 +583,46 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "Condition"
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "ObsBloodPressure"
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "sex"
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "smoker"
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "postcode"
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "ObsTotalCholesterol",
+        "language": "application/x-fhir-query",
+        "expression": "Observation?code=14647-2&_count=1&_sort=-date&patient={{%patient.id}}"
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "ObsHDLCholesterol",
+        "language": "application/x-fhir-query",
+        "expression": "Observation?code=14646-4&_count=1&_sort=-date&patient={{%patient.id}}"
+      }
     }
   ],
   "name": "AbsoluteCVDRiskCalculation",

diff --git a/fsh-generated/resources/Questionnaire-AllergiesAdverseReactions.json b/fsh-generated/resources/Questionnaire-AllergiesAdverseReactions.json
@@ -179,6 +179,10 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
     }
   ],
   "name": "AllergiesAdverseReactions",

diff --git a/fsh-generated/resources/Questionnaire-AssemblyInstructions.json b/fsh-generated/resources/Questionnaire-AssemblyInstructions.json
@@ -26,30 +26,6 @@
             ]
           }
         },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/variable",
-          "valueExpression": {
-            "name": "PostalAddress",
-            "language": "text/fhirpath",
-            "expression": "%patient.address.where(type='postal')"
-          }
-        },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/variable",
-          "valueExpression": {
-            "name": "weight",
-            "language": "text/fhirpath",
-            "expression": "item.where(linkId='c587e3b6-b91a-40dc-9a16-179342d001e9').item.where(linkId='53d5d5a6-3198-4bec-92ac-03fe7d77fb68').item.where(linkId='97ed4c86-8820-4e4d-9234-0e0e8b6ca44a').item.where(linkId='443bd584-684a-449c-ab6e-9d07da4df9fa').answer.value"
-          }
-        },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/variable",
-          "valueExpression": {
-            "name": "height",
-            "language": "text/fhirpath",
-            "expression": "item.where(linkId='c587e3b6-b91a-40dc-9a16-179342d001e9').item.where(linkId='53d5d5a6-3198-4bec-92ac-03fe7d77fb68').item.where(linkId='6226a5c5-b5c3-4ebb-a689-2b286322cfe0').item.where(linkId='7035c7e7-ada3-4c6b-9ea8-f39666f5d4ea').answer.value"
-          }
-        },
         {
           "url": "http://hl7.org/fhir/StructureDefinition/variable",
           "valueExpression": {
@@ -2234,22 +2210,6 @@
         }
       ]
     },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "QuestionnaireResponseLatestCompleted",
-        "language": "application/x-fhir-query",
-        "expression": "QuestionnaireResponse?status=completed&_count=1&_sort=-authored&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "QuestionnaireResponseLatest",
-        "language": "application/x-fhir-query",
-        "expression": "QuestionnaireResponse?_count=1&_sort=-authored&patient={{%patient.id}}"
-      }
-    },
     {
       "url": "http://hl7.org/fhir/StructureDefinition/variable",
       "valueExpression": {
@@ -2258,62 +2218,6 @@
         "expression": "Condition?patient={{%patient.id}}"
       }
     },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsSex",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=1515311000168102&status=final&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsTobaccoSmokingStatus",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=72166-2&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsBodyHeight",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=8302-2&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsBodyWeight",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=29463-7&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsBMI",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=39156-5&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsHeadCircumference",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=9843-4&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsWaistCircumference",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=8280-0&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
     {
       "url": "http://hl7.org/fhir/StructureDefinition/variable",
       "valueExpression": {
@@ -2322,30 +2226,6 @@
         "expression": "Observation?code=85354-9&_count=1&_sort=-date&patient={{%patient.id}}"
       }
     },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsHeartRate",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=8867-4&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsTotalCholesterol",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=14647-2&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/variable",
-      "valueExpression": {
-        "name": "ObsHDLCholesterol",
-        "language": "application/x-fhir-query",
-        "expression": "Observation?code=14646-4&_count=1&_sort=-date&patient={{%patient.id}}"
-      }
-    },
     {
       "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
       "valueReference": {

diff --git a/fsh-generated/resources/Questionnaire-ChronicDiseaseAgeing.json b/fsh-generated/resources/Questionnaire-ChronicDiseaseAgeing.json
@@ -196,6 +196,10 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
     }
   ],
   "name": "ChronicDiseaseAgeing",

diff --git a/fsh-generated/resources/Questionnaire-Consent.json b/fsh-generated/resources/Questionnaire-Consent.json
@@ -526,6 +526,10 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
     }
   ],
   "name": "Consent",

diff --git a/fsh-generated/resources/Questionnaire-CurrentPriorities.json b/fsh-generated/resources/Questionnaire-CurrentPriorities.json
@@ -426,6 +426,10 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
     }
   ],
   "name": "CurrentPriorities",

diff --git a/fsh-generated/resources/Questionnaire-EarHealthAndHearing.json b/fsh-generated/resources/Questionnaire-EarHealthAndHearing.json
@@ -750,6 +750,10 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
     }
   ],
   "name": "EarHealthAndHearing",

diff --git a/fsh-generated/resources/Questionnaire-Examination.json b/fsh-generated/resources/Questionnaire-Examination.json
@@ -956,6 +956,70 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "ObsBloodPressure"
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "ObsWaistCircumference",
+        "language": "application/x-fhir-query",
+        "expression": "Observation?code=8280-0&_count=1&_sort=-date&patient={{%patient.id}}"
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "ObsHeartRate",
+        "language": "application/x-fhir-query",
+        "expression": "Observation?code=8867-4&_count=1&_sort=-date&patient={{%patient.id}}"
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "ObsBodyHeight",
+        "language": "application/x-fhir-query",
+        "expression": "Observation?code=8302-2&_count=1&_sort=-date&patient={{%patient.id}}"
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "ObsBodyWeight",
+        "language": "application/x-fhir-query",
+        "expression": "Observation?code=29463-7&_count=1&_sort=-date&patient={{%patient.id}}"
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "ObsHeadCircumference",
+        "language": "application/x-fhir-query",
+        "expression": "Observation?code=9843-4&_count=1&_sort=-date&patient={{%patient.id}}"
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "weight",
+        "language": "text/fhirpath",
+        "expression": "item.where(linkId='c587e3b6-b91a-40dc-9a16-179342d001e9').item.where(linkId='53d5d5a6-3198-4bec-92ac-03fe7d77fb68').item.where(linkId='97ed4c86-8820-4e4d-9234-0e0e8b6ca44a').item.where(linkId='443bd584-684a-449c-ab6e-9d07da4df9fa').answer.value"
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/variable",
+      "valueExpression": {
+        "name": "height",
+        "language": "text/fhirpath",
+        "expression": "item.where(linkId='c587e3b6-b91a-40dc-9a16-179342d001e9').item.where(linkId='53d5d5a6-3198-4bec-92ac-03fe7d77fb68').item.where(linkId='6226a5c5-b5c3-4ebb-a689-2b286322cfe0').item.where(linkId='7035c7e7-ada3-4c6b-9ea8-f39666f5d4ea').answer.value"
+      }
     }
   ],
   "name": "Examination",

diff --git a/fsh-generated/resources/Questionnaire-EyeHealth.json b/fsh-generated/resources/Questionnaire-EyeHealth.json
@@ -507,6 +507,10 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
     }
   ],
   "name": "EyeHealth",

diff --git a/fsh-generated/resources/Questionnaire-FamilyHistory.json b/fsh-generated/resources/Questionnaire-FamilyHistory.json
@@ -234,6 +234,10 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
     }
   ],
   "name": "FamilyHistory",

diff --git a/fsh-generated/resources/Questionnaire-FinalisingHealthCheck.json b/fsh-generated/resources/Questionnaire-FinalisingHealthCheck.json
@@ -1043,6 +1043,10 @@
           "valueString": "The practitioner user that is to be used to pre-populate the form"
         }
       ]
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
+      "valueString": "age"
     }
   ],
   "name": "FinalisingHealthCheck",