diff --git a/fsh-generated/resources/ImplementationGuide-csiro.fhir.au.smartforms.json b/fsh-generated/resources/ImplementationGuide-csiro.fhir.au.smartforms.json index 41d583f..274e915 100644 --- 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 index e0f0fbe..ae125c8 100644 --- 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 index df5e529..2164264 100644 --- 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 index 46306cd..6ede613 100644 --- 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 index 2591d1b..c0823ff 100644 --- 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 index ed22138..3643a52 100644 --- 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 index 70d0a69..89e93a1 100644 --- 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 index 646fea9..706f083 100644 --- 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 index 67167e5..605579d 100644 --- 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 index e598872..9e374b0 100644 --- 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 index ecbae6b..34e8c71 100644 --- 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 index 8f7e7e4..c659b22 100644 --- 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 index 2be378a..d90eb09 100644 --- 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", diff --git a/fsh-generated/resources/Questionnaire-Gambling.json b/fsh-generated/resources/Questionnaire-Gambling.json index a11b409..c093635 100644 --- a/fsh-generated/resources/Questionnaire-Gambling.json +++ b/fsh-generated/resources/Questionnaire-Gambling.json @@ -264,6 +264,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": "Gambling", diff --git a/fsh-generated/resources/Questionnaire-HealthPrioritiesSummary.json b/fsh-generated/resources/Questionnaire-HealthPrioritiesSummary.json index 4bb4286..d43cd86 100644 --- a/fsh-generated/resources/Questionnaire-HealthPrioritiesSummary.json +++ b/fsh-generated/resources/Questionnaire-HealthPrioritiesSummary.json @@ -827,6 +827,134 @@ "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": "HealthPrioritiesSummaryCurrentPriorities" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryMedicalHistory" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryRegularMedications" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryAllergiesAdverseReactions" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryFamilyHistory" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummarySocialEmotionalWellbeing" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummarySocialHistory" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryHomeFamily" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryLearningDevelopment" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryLearningWorkAdults" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryLearningWorkOlder" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryMood" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryMemoryThinking" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryChronicDiseaseAgeing" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryScreeningPrograms" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryHealthyEating" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryPhysicalActivityScreenTimeNotOlder" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryPhysicalActivityScreenTimeOlder" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummarySubstanceUse" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryGambling" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummarySexualHealthAdolescents" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummarySexualHealthAdults" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummarySexualHealthOlder" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryEyeHealth" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryEarHealthHearing" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryOralDentalHealth" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummarySkin" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryImmunisation" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryExamination" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryAbsoluteCVDRisk" + }, + { + "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext", + "valueString": "HealthPrioritiesSummaryInvestigations" } ], "name": "HealthPrioritiesActionsAndFollowUpSummary", diff --git a/fsh-generated/resources/Questionnaire-HealthyEating.json b/fsh-generated/resources/Questionnaire-HealthyEating.json index 4363bf6..7b7c1cf 100644 --- a/fsh-generated/resources/Questionnaire-HealthyEating.json +++ b/fsh-generated/resources/Questionnaire-HealthyEating.json @@ -630,6 +630,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": "HealthyEating", diff --git a/fsh-generated/resources/Questionnaire-HomeAndFamily.json b/fsh-generated/resources/Questionnaire-HomeAndFamily.json index 872fb22..bd9cc93 100644 --- a/fsh-generated/resources/Questionnaire-HomeAndFamily.json +++ b/fsh-generated/resources/Questionnaire-HomeAndFamily.json @@ -338,6 +338,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": "HomeAndFamily", diff --git a/fsh-generated/resources/Questionnaire-Immunisation.json b/fsh-generated/resources/Questionnaire-Immunisation.json index 00e84e2..fd8fbf5 100644 --- a/fsh-generated/resources/Questionnaire-Immunisation.json +++ b/fsh-generated/resources/Questionnaire-Immunisation.json @@ -350,6 +350,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": "Immunisation", diff --git a/fsh-generated/resources/Questionnaire-Investigations.json b/fsh-generated/resources/Questionnaire-Investigations.json index d1deec9..e37a140 100644 --- a/fsh-generated/resources/Questionnaire-Investigations.json +++ b/fsh-generated/resources/Questionnaire-Investigations.json @@ -221,6 +221,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": "Investigations", diff --git a/fsh-generated/resources/Questionnaire-LearningAndDevelopment.json b/fsh-generated/resources/Questionnaire-LearningAndDevelopment.json index 8e9e2a6..f4f1ea7 100644 --- a/fsh-generated/resources/Questionnaire-LearningAndDevelopment.json +++ b/fsh-generated/resources/Questionnaire-LearningAndDevelopment.json @@ -492,6 +492,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": "LearningAndDevelopment", diff --git a/fsh-generated/resources/Questionnaire-LearningAndWork.json b/fsh-generated/resources/Questionnaire-LearningAndWork.json index 6000b16..77754cc 100644 --- a/fsh-generated/resources/Questionnaire-LearningAndWork.json +++ b/fsh-generated/resources/Questionnaire-LearningAndWork.json @@ -564,6 +564,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": "LearningAndWork", diff --git a/fsh-generated/resources/Questionnaire-MedicalHistoryCurrentProblems.json b/fsh-generated/resources/Questionnaire-MedicalHistoryCurrentProblems.json index ed4eae4..93eb19b 100644 --- a/fsh-generated/resources/Questionnaire-MedicalHistoryCurrentProblems.json +++ b/fsh-generated/resources/Questionnaire-MedicalHistoryCurrentProblems.json @@ -1220,6 +1220,14 @@ "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" } ], "name": "MedicalHistoryCurrentProblems", diff --git a/fsh-generated/resources/Questionnaire-MemoryAndThinking.json b/fsh-generated/resources/Questionnaire-MemoryAndThinking.json index c284277..bbc7d9c 100644 --- a/fsh-generated/resources/Questionnaire-MemoryAndThinking.json +++ b/fsh-generated/resources/Questionnaire-MemoryAndThinking.json @@ -338,6 +338,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": "MemoryAndThinking", diff --git a/fsh-generated/resources/Questionnaire-Mood.json b/fsh-generated/resources/Questionnaire-Mood.json index 2536db7..804732d 100644 --- a/fsh-generated/resources/Questionnaire-Mood.json +++ b/fsh-generated/resources/Questionnaire-Mood.json @@ -244,6 +244,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": "Mood", diff --git a/fsh-generated/resources/Questionnaire-OralAndDentalHealth.json b/fsh-generated/resources/Questionnaire-OralAndDentalHealth.json index a080c3a..620639b 100644 --- a/fsh-generated/resources/Questionnaire-OralAndDentalHealth.json +++ b/fsh-generated/resources/Questionnaire-OralAndDentalHealth.json @@ -388,6 +388,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": "OralAndDentalHealth", diff --git a/fsh-generated/resources/Questionnaire-PatientDetails.json b/fsh-generated/resources/Questionnaire-PatientDetails.json index 7b44830..3568650 100644 --- a/fsh-generated/resources/Questionnaire-PatientDetails.json +++ b/fsh-generated/resources/Questionnaire-PatientDetails.json @@ -1648,6 +1648,26 @@ "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/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": "PostalAddress", + "language": "text/fhirpath", + "expression": "%patient.address.where(type='postal')" + } } ], "name": "PatientDetails", diff --git a/fsh-generated/resources/Questionnaire-PhysicalActivityAndScreenTime.json b/fsh-generated/resources/Questionnaire-PhysicalActivityAndScreenTime.json index ac38625..2a3ac0e 100644 --- a/fsh-generated/resources/Questionnaire-PhysicalActivityAndScreenTime.json +++ b/fsh-generated/resources/Questionnaire-PhysicalActivityAndScreenTime.json @@ -625,6 +625,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": "PhysicalActivityAndScreenTime", diff --git a/fsh-generated/resources/Questionnaire-RedFlagsEarlyIdentificationGuide.json b/fsh-generated/resources/Questionnaire-RedFlagsEarlyIdentificationGuide.json index 439a71a..5d0375d 100644 --- a/fsh-generated/resources/Questionnaire-RedFlagsEarlyIdentificationGuide.json +++ b/fsh-generated/resources/Questionnaire-RedFlagsEarlyIdentificationGuide.json @@ -1336,6 +1336,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": "RedFlagsEarlyIdentificationGuideForChildren", diff --git a/fsh-generated/resources/Questionnaire-RegularMedications.json b/fsh-generated/resources/Questionnaire-RegularMedications.json index ca7b7ea..e93bc62 100644 --- a/fsh-generated/resources/Questionnaire-RegularMedications.json +++ b/fsh-generated/resources/Questionnaire-RegularMedications.json @@ -348,6 +348,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": "RegularMedications", diff --git a/fsh-generated/resources/Questionnaire-ScreeningPrograms.json b/fsh-generated/resources/Questionnaire-ScreeningPrograms.json index 0aa6650..bab7789 100644 --- a/fsh-generated/resources/Questionnaire-ScreeningPrograms.json +++ b/fsh-generated/resources/Questionnaire-ScreeningPrograms.json @@ -341,6 +341,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": "ScreeningPrograms", diff --git a/fsh-generated/resources/Questionnaire-SexualHealth.json b/fsh-generated/resources/Questionnaire-SexualHealth.json index 3391277..d5620cc 100644 --- a/fsh-generated/resources/Questionnaire-SexualHealth.json +++ b/fsh-generated/resources/Questionnaire-SexualHealth.json @@ -824,6 +824,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": "SexualHealth", diff --git a/fsh-generated/resources/Questionnaire-Skin.json b/fsh-generated/resources/Questionnaire-Skin.json index 09465e8..dba7f03 100644 --- a/fsh-generated/resources/Questionnaire-Skin.json +++ b/fsh-generated/resources/Questionnaire-Skin.json @@ -374,6 +374,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": "Skin", diff --git a/fsh-generated/resources/Questionnaire-SocialAndEmotionalWellbeing.json b/fsh-generated/resources/Questionnaire-SocialAndEmotionalWellbeing.json index 156e08f..1c343f3 100644 --- a/fsh-generated/resources/Questionnaire-SocialAndEmotionalWellbeing.json +++ b/fsh-generated/resources/Questionnaire-SocialAndEmotionalWellbeing.json @@ -313,6 +313,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": "SocialAndEmotionalWellbeing", diff --git a/fsh-generated/resources/Questionnaire-SocialHistoryChild.json b/fsh-generated/resources/Questionnaire-SocialHistoryChild.json index 718d9a0..05ede03 100644 --- a/fsh-generated/resources/Questionnaire-SocialHistoryChild.json +++ b/fsh-generated/resources/Questionnaire-SocialHistoryChild.json @@ -329,6 +329,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": "SocialHistoryChild", diff --git a/fsh-generated/resources/Questionnaire-SubstanceUse.json b/fsh-generated/resources/Questionnaire-SubstanceUse.json index f5273d8..5a0c41d 100644 --- a/fsh-generated/resources/Questionnaire-SubstanceUse.json +++ b/fsh-generated/resources/Questionnaire-SubstanceUse.json @@ -391,6 +391,18 @@ "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/StructureDefinition/variable", + "valueExpression": { + "name": "ObsTobaccoSmokingStatus", + "language": "application/x-fhir-query", + "expression": "Observation?code=72166-2&_count=1&_sort=-date&patient={{%patient.id}}" + } } ], "name": "SubstanceUse", diff --git a/input/fsh/715-AboutTheHealthCheck.fsh b/input/fsh/715-AboutTheHealthCheck.fsh index 5ad7616..024046b 100644 --- a/input/fsh/715-AboutTheHealthCheck.fsh +++ b/input/fsh/715-AboutTheHealthCheck.fsh @@ -15,6 +15,11 @@ Description: "About The Health Check sub-questionnaire for Aboriginal and Torres * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assemble-expectation" * valueCode = #assemble-child +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" + //launch context * extension[+] * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext" @@ -39,6 +44,20 @@ Description: "About The Health Check sub-questionnaire for Aboriginal and Torres * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" +//fhir query variables +* extension[+] + * 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}}" +* extension[+] + * url = "http://hl7.org/fhir/StructureDefinition/variable" + * valueExpression + * name = "QuestionnaireResponseLatest" + * language = #application/x-fhir-query + * expression = "QuestionnaireResponse?_count=1&_sort=-authored&patient={{%patient.id}}" + * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-pop-exp" diff --git a/input/fsh/715-AssemblyInstructions.fsh b/input/fsh/715-AssemblyInstructions.fsh index 897315e..c36824d 100644 --- a/input/fsh/715-AssemblyInstructions.fsh +++ b/input/fsh/715-AssemblyInstructions.fsh @@ -58,90 +58,20 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form //* extension[sdc-questionnaire-sourceQueries].valueReference = Reference(PrePopQuery) //fhir query variables -* extension[+] - * 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}}" -* extension[+] - * url = "http://hl7.org/fhir/StructureDefinition/variable" - * valueExpression - * name = "QuestionnaireResponseLatest" - * language = #application/x-fhir-query - * expression = "QuestionnaireResponse?_count=1&_sort=-authored&patient={{%patient.id}}" * extension[+] * url = "http://hl7.org/fhir/StructureDefinition/variable" * valueExpression * name = "Condition" * language = #application/x-fhir-query * expression = "Condition?patient={{%patient.id}}" -* extension[+] - * 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}}" -* extension[+] - * 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}}" -* extension[+] - * 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}}" -* extension[+] - * 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}}" -* extension[+] - * 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}}" -* extension[+] - * 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}}" -* extension[+] - * 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}}" * extension[+] * url = "http://hl7.org/fhir/StructureDefinition/variable" * valueExpression * name = "ObsBloodPressure" * language = #application/x-fhir-query * expression = "Observation?code=85354-9&_count=1&_sort=-date&patient={{%patient.id}}" -* extension[+] - * 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}}" -* extension[+] - * 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}}" -* extension[+] - * 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}}" + + //workaround to stop server stripping of value sets referenced as canonical * extension[+] @@ -210,18 +140,6 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form * type = #group * extension[http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl][+].valueCodeableConcept = http://hl7.org/fhir/questionnaire-item-control|1.0.0#tab-container //fhirpath variables - * extension[http://hl7.org/fhir/StructureDefinition/variable].valueExpression - * name = "PostalAddress" - * language = #text/fhirpath - * expression = "%patient.address.where(type='postal')" - * extension[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" - * extension[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" * extension[http://hl7.org/fhir/StructureDefinition/variable][+].valueExpression * name = "age" * language = #text/fhirpath diff --git a/input/fsh/715-Assessment-AbsoluteCVDRiskCalculation.fsh b/input/fsh/715-Assessment-AbsoluteCVDRiskCalculation.fsh index 3ca19ab..07c0301 100644 --- a/input/fsh/715-Assessment-AbsoluteCVDRiskCalculation.fsh +++ b/input/fsh/715-Assessment-AbsoluteCVDRiskCalculation.fsh @@ -38,6 +38,40 @@ Description: "Absolute Cardiovascular Disease Risk Calculation sub-questionnaire * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "Condition" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "ObsBloodPressure" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "sex" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "smoker" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "postcode" + +//fhir query variables +* extension[+] + * 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}}" +* extension[+] + * 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}}" + * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-pop-exp" diff --git a/input/fsh/715-Assessment-AllergiesAdverseReactions.fsh b/input/fsh/715-Assessment-AllergiesAdverseReactions.fsh index 39c4f38..a29be3c 100644 --- a/input/fsh/715-Assessment-AllergiesAdverseReactions.fsh +++ b/input/fsh/715-Assessment-AllergiesAdverseReactions.fsh @@ -36,6 +36,11 @@ Description: "Allergies/Adverse Reactions sub-questionnaire for Aboriginal and T * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-ChronicDiseaseAgeing.fsh b/input/fsh/715-Assessment-ChronicDiseaseAgeing.fsh index 4f4bdbe..78b9443 100644 --- a/input/fsh/715-Assessment-ChronicDiseaseAgeing.fsh +++ b/input/fsh/715-Assessment-ChronicDiseaseAgeing.fsh @@ -37,6 +37,11 @@ Description: "Chronic Disease Ageing sub-questionnaire for Aboriginal and Torres * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-CurrentPriorities.fsh b/input/fsh/715-Assessment-CurrentPriorities.fsh index d3c5b4f..6b716c6 100644 --- a/input/fsh/715-Assessment-CurrentPriorities.fsh +++ b/input/fsh/715-Assessment-CurrentPriorities.fsh @@ -38,6 +38,11 @@ Description: "Current Priorities sub-questionnaire for Aboriginal and Torres Str * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-EarHealthAndHearing.fsh b/input/fsh/715-Assessment-EarHealthAndHearing.fsh index 4daf458..477952b 100644 --- a/input/fsh/715-Assessment-EarHealthAndHearing.fsh +++ b/input/fsh/715-Assessment-EarHealthAndHearing.fsh @@ -38,6 +38,11 @@ Description: "Ear Health And Hearing sub-questionnaire for Aboriginal and Torres * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-Examination.fsh b/input/fsh/715-Assessment-Examination.fsh index c5e82df..2d01996 100644 --- a/input/fsh/715-Assessment-Examination.fsh +++ b/input/fsh/715-Assessment-Examination.fsh @@ -38,6 +38,64 @@ Description: "Examination sub-questionnaire for Aboriginal and Torres Strait Isl * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "ObsBloodPressure" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" + +//fhir query variables + +* extension[+] + * 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}}" +* extension[+] + * 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}}" +* extension[+] + * 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}}" +* extension[+] + * 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}}" +* extension[+] + * 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}}" + + + +//fhirpath variables +* extension[+] + * 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" +* extension[+] + * 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" + + * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-pop-exp" @@ -51,7 +109,7 @@ Description: "Examination sub-questionnaire for Aboriginal and Torres Strait Isl * jurisdiction.coding = urn:iso:std:iso:3166#AU -* item[+] +* item[+] * extension[http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression].valueExpression * language = #text/fhirpath * expression = "%age.exists()" diff --git a/input/fsh/715-Assessment-EyeHealth.fsh b/input/fsh/715-Assessment-EyeHealth.fsh index 08580b1..8b6c689 100644 --- a/input/fsh/715-Assessment-EyeHealth.fsh +++ b/input/fsh/715-Assessment-EyeHealth.fsh @@ -38,6 +38,11 @@ Description: "Eye Health sub-questionnaire for Aboriginal and Torres Strait Isla * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-FamilyHistory.fsh b/input/fsh/715-Assessment-FamilyHistory.fsh index eb102f0..092059f 100644 --- a/input/fsh/715-Assessment-FamilyHistory.fsh +++ b/input/fsh/715-Assessment-FamilyHistory.fsh @@ -37,6 +37,11 @@ Description: "Family History sub-questionnaire for Aboriginal and Torres Strait * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-Gambling.fsh b/input/fsh/715-Assessment-Gambling.fsh index ba93733..c92a93d 100644 --- a/input/fsh/715-Assessment-Gambling.fsh +++ b/input/fsh/715-Assessment-Gambling.fsh @@ -38,6 +38,11 @@ Description: "Gambling sub-questionnaire for Aboriginal and Torres Strait Island * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-HealthyEating.fsh b/input/fsh/715-Assessment-HealthyEating.fsh index a4fd0f0..06b6bd9 100644 --- a/input/fsh/715-Assessment-HealthyEating.fsh +++ b/input/fsh/715-Assessment-HealthyEating.fsh @@ -38,6 +38,11 @@ Description: "Healthy Eating sub-questionnaire for Aboriginal and Torres Strait * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-HomeAndFamily.fsh b/input/fsh/715-Assessment-HomeAndFamily.fsh index a76f19d..a6bb939 100644 --- a/input/fsh/715-Assessment-HomeAndFamily.fsh +++ b/input/fsh/715-Assessment-HomeAndFamily.fsh @@ -38,6 +38,11 @@ Description: "Home And Family sub-questionnaire for Aboriginal and Torres Strait * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-Immunisation.fsh b/input/fsh/715-Assessment-Immunisation.fsh index 27c73c6..2fa9ec2 100644 --- a/input/fsh/715-Assessment-Immunisation.fsh +++ b/input/fsh/715-Assessment-Immunisation.fsh @@ -38,6 +38,11 @@ Description: "Immunisation sub-questionnaire for Aboriginal and Torres Strait Is * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-Investigations.fsh b/input/fsh/715-Assessment-Investigations.fsh index ef949c5..0acce3f 100644 --- a/input/fsh/715-Assessment-Investigations.fsh +++ b/input/fsh/715-Assessment-Investigations.fsh @@ -37,6 +37,11 @@ Description: "Investigations sub-questionnaire for Aboriginal and Torres Strait * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-LearningAndDevelopment.fsh b/input/fsh/715-Assessment-LearningAndDevelopment.fsh index f9d7ce0..46899d2 100644 --- a/input/fsh/715-Assessment-LearningAndDevelopment.fsh +++ b/input/fsh/715-Assessment-LearningAndDevelopment.fsh @@ -36,6 +36,11 @@ Description: "Learning And Development sub-questionnaire for Aboriginal and Torr * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-LearningAndWork.fsh b/input/fsh/715-Assessment-LearningAndWork.fsh index bf28435..ef7ba75 100644 --- a/input/fsh/715-Assessment-LearningAndWork.fsh +++ b/input/fsh/715-Assessment-LearningAndWork.fsh @@ -39,6 +39,11 @@ Description: "Learning And Work sub-questionnaire for Aboriginal and Torres Stra * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-MedicalHistoryCurrentProblems.fsh b/input/fsh/715-Assessment-MedicalHistoryCurrentProblems.fsh index 8d5690b..f478afb 100644 --- a/input/fsh/715-Assessment-MedicalHistoryCurrentProblems.fsh +++ b/input/fsh/715-Assessment-MedicalHistoryCurrentProblems.fsh @@ -44,6 +44,14 @@ Description: "Medical History sub-questionnaire for Aboriginal and Torres Strait * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "Condition" + * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-pop-exp" diff --git a/input/fsh/715-Assessment-MemoryAndThinking.fsh b/input/fsh/715-Assessment-MemoryAndThinking.fsh index 95299bd..f1a551e 100644 --- a/input/fsh/715-Assessment-MemoryAndThinking.fsh +++ b/input/fsh/715-Assessment-MemoryAndThinking.fsh @@ -38,6 +38,11 @@ Description: "Memory And Thinking sub-questionnaire for Aboriginal and Torres St * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-Mood.fsh b/input/fsh/715-Assessment-Mood.fsh index 00a4c98..edf6874 100644 --- a/input/fsh/715-Assessment-Mood.fsh +++ b/input/fsh/715-Assessment-Mood.fsh @@ -37,6 +37,11 @@ Description: "Mood sub-questionnaire for Aboriginal and Torres Strait Islander H * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-OralAndDentalHealth.fsh b/input/fsh/715-Assessment-OralAndDentalHealth.fsh index 9784128..e1ef634 100644 --- a/input/fsh/715-Assessment-OralAndDentalHealth.fsh +++ b/input/fsh/715-Assessment-OralAndDentalHealth.fsh @@ -38,6 +38,11 @@ Description: "Oral And Dental Health sub-questionnaire for Aboriginal and Torres * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-PhysicalActivityAndScreenTime.fsh b/input/fsh/715-Assessment-PhysicalActivityAndScreenTime.fsh index 23b6ed1..8b91070 100644 --- a/input/fsh/715-Assessment-PhysicalActivityAndScreenTime.fsh +++ b/input/fsh/715-Assessment-PhysicalActivityAndScreenTime.fsh @@ -38,6 +38,11 @@ Description: "Physical Activity And Screen Time sub-questionnaire for Aboriginal * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-RedFlagsEarlyIdentificationGuide.fsh b/input/fsh/715-Assessment-RedFlagsEarlyIdentificationGuide.fsh index 54b2d09..cbc5245 100644 --- a/input/fsh/715-Assessment-RedFlagsEarlyIdentificationGuide.fsh +++ b/input/fsh/715-Assessment-RedFlagsEarlyIdentificationGuide.fsh @@ -36,6 +36,11 @@ Description: "Red Flags Early Identification Guide For Children sub-questionnair * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-RegularMedications.fsh b/input/fsh/715-Assessment-RegularMedications.fsh index db3593b..b5c34b3 100644 --- a/input/fsh/715-Assessment-RegularMedications.fsh +++ b/input/fsh/715-Assessment-RegularMedications.fsh @@ -38,6 +38,11 @@ Description: "Regular Medications sub-questionnaire for Aboriginal and Torres St * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-ScreeningPrograms.fsh b/input/fsh/715-Assessment-ScreeningPrograms.fsh index 944e6cf..611da9d 100644 --- a/input/fsh/715-Assessment-ScreeningPrograms.fsh +++ b/input/fsh/715-Assessment-ScreeningPrograms.fsh @@ -36,6 +36,11 @@ Description: "Screening Programs sub-questionnaire for Aboriginal and Torres Str * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-SexualHealth.fsh b/input/fsh/715-Assessment-SexualHealth.fsh index 91c32cd..369e054 100644 --- a/input/fsh/715-Assessment-SexualHealth.fsh +++ b/input/fsh/715-Assessment-SexualHealth.fsh @@ -39,6 +39,11 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-Skin.fsh b/input/fsh/715-Assessment-Skin.fsh index 11d967a..4e0a6ec 100644 --- a/input/fsh/715-Assessment-Skin.fsh +++ b/input/fsh/715-Assessment-Skin.fsh @@ -38,6 +38,11 @@ Description: "Skin sub-questionnaire for Aboriginal and Torres Strait Islander H * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-SocialAndEmotionalWellbeing.fsh b/input/fsh/715-Assessment-SocialAndEmotionalWellbeing.fsh index 30ab796..6d4d362 100644 --- a/input/fsh/715-Assessment-SocialAndEmotionalWellbeing.fsh +++ b/input/fsh/715-Assessment-SocialAndEmotionalWellbeing.fsh @@ -38,6 +38,11 @@ Description: "Social And Emotional Wellbeing sub-questionnaire for Aboriginal an * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-SocialHistoryChild.fsh b/input/fsh/715-Assessment-SocialHistoryChild.fsh index 28aa9cf..b41ecc6 100644 --- a/input/fsh/715-Assessment-SocialHistoryChild.fsh +++ b/input/fsh/715-Assessment-SocialHistoryChild.fsh @@ -38,6 +38,11 @@ Description: "Social History Child sub-questionnaire for Aboriginal and Torres S * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Assessment-SubstanceUse.fsh b/input/fsh/715-Assessment-SubstanceUse.fsh index 9c83b3a..7aa9e5e 100644 --- a/input/fsh/715-Assessment-SubstanceUse.fsh +++ b/input/fsh/715-Assessment-SubstanceUse.fsh @@ -37,6 +37,19 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" + +//fhir query variables +* extension[+] + * 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}}" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-Consent.fsh b/input/fsh/715-Consent.fsh index 9201497..5d7b99f 100644 --- a/input/fsh/715-Consent.fsh +++ b/input/fsh/715-Consent.fsh @@ -40,6 +40,11 @@ Description: "Consent sub-questionnaire for Aboriginal and Torres Strait Islande * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-FinalisingHealthCheck.fsh b/input/fsh/715-FinalisingHealthCheck.fsh index 1fd0dc1..99d8245 100644 --- a/input/fsh/715-FinalisingHealthCheck.fsh +++ b/input/fsh/715-FinalisingHealthCheck.fsh @@ -37,6 +37,11 @@ Description: "Finalising the Health Check sub-questionnaire for Aboriginal and T * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-HealthPrioritiesSummary.fsh b/input/fsh/715-HealthPrioritiesSummary.fsh index 7302d1e..01fb665 100644 --- a/input/fsh/715-HealthPrioritiesSummary.fsh +++ b/input/fsh/715-HealthPrioritiesSummary.fsh @@ -37,6 +37,105 @@ Description: "Health Priorities, Actions And Follow-Up Summary sub-questionnaire * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryCurrentPriorities" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryMedicalHistory" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryRegularMedications" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryAllergiesAdverseReactions" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryFamilyHistory" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummarySocialEmotionalWellbeing" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummarySocialHistory" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryHomeFamily" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryLearningDevelopment" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryLearningWorkAdults" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryLearningWorkOlder" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryMood" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryMemoryThinking" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryChronicDiseaseAgeing" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryScreeningPrograms" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryHealthyEating" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryPhysicalActivityScreenTimeNotOlder" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryPhysicalActivityScreenTimeOlder" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummarySubstanceUse" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryGambling" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummarySexualHealthAdolescents" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummarySexualHealthAdults" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummarySexualHealthOlder" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryEyeHealth" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryEarHealthHearing" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryOralDentalHealth" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummarySkin" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryImmunisation" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryExamination" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryAbsoluteCVDRisk" +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "HealthPrioritiesSummaryInvestigations" + * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/input/fsh/715-PatientDetails.fsh b/input/fsh/715-PatientDetails.fsh index f50ba51..48ed1fa 100644 --- a/input/fsh/715-PatientDetails.fsh +++ b/input/fsh/715-PatientDetails.fsh @@ -40,6 +40,28 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait * extension[+] * url = "description" * valueString = "The practitioner user that is to be used to pre-populate the form" + +//assemble context +* extension[+] + * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext" + * valueString = "age" + +//fhir query variables + +* extension[+] + * 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}}" + + //fhirpath variables +* extension[+] + * url = "http://hl7.org/fhir/StructureDefinition/variable" + * valueExpression + * name = "PostalAddress" + * language = #text/fhirpath + * expression = "%patient.address.where(type='postal')" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render" * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular" diff --git a/sushi-config.yaml b/sushi-config.yaml index f0680b6..c42b568 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -27,7 +27,7 @@ publisher: dependencies: hl7.fhir.au.core: current - hl7.fhir.uv.sdc: current + hl7.fhir.uv.sdc: 3.0.0 # # # The pages property corresponds to IG.definition.page. SUSHI can