diff --git a/examples/UKCore-Bundle-NEWS2Observations-Example.xml b/examples/UKCore-Bundle-NEWS2Observations-Example.xml new file mode 100644 index 00000000..dfa2b939 --- /dev/null +++ b/examples/UKCore-Bundle-NEWS2Observations-Example.xml @@ -0,0 +1,538 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Device-Sphygmomanometer-Example.xml b/examples/UKCore-Device-Sphygmomanometer-Example.xml new file mode 100644 index 00000000..82c5a31b --- /dev/null +++ b/examples/UKCore-Device-Sphygmomanometer-Example.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/UKCore-Extension-CuffSize-Example.xml b/examples/UKCore-Extension-CuffSize-Example.xml new file mode 100644 index 00000000..80543d69 --- /dev/null +++ b/examples/UKCore-Extension-CuffSize-Example.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Extension-RecordingSetting-Example.xml b/examples/UKCore-Extension-RecordingSetting-Example.xml new file mode 100644 index 00000000..2879339e --- /dev/null +++ b/examples/UKCore-Extension-RecordingSetting-Example.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-24HourBloodPressure-Example.xml b/examples/UKCore-Observation-24HourBloodPressure-Example.xml new file mode 100644 index 00000000..afa4456f --- /dev/null +++ b/examples/UKCore-Observation-24HourBloodPressure-Example.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-BreathingNormally-Example.xml b/examples/UKCore-Observation-BreathingNormally-Example.xml new file mode 100644 index 00000000..59ef8d1b --- /dev/null +++ b/examples/UKCore-Observation-BreathingNormally-Example.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-FastingTest-Example.xml b/examples/UKCore-Observation-FastingTest-Example.xml new file mode 100644 index 00000000..17ce7065 --- /dev/null +++ b/examples/UKCore-Observation-FastingTest-Example.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-HeavyDrinker-Example.xml b/examples/UKCore-Observation-HeavyDrinker-Example.xml new file mode 100644 index 00000000..aa11ce7b --- /dev/null +++ b/examples/UKCore-Observation-HeavyDrinker-Example.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-VitalSigns-NPEWSTotal-Example.xml b/examples/UKCore-Observation-NPEWSTotal-Example.xml similarity index 93% rename from examples/UKCore-Observation-VitalSigns-NPEWSTotal-Example.xml rename to examples/UKCore-Observation-NPEWSTotal-Example.xml index 78d832ec..ed4d1363 100644 --- a/examples/UKCore-Observation-VitalSigns-NPEWSTotal-Example.xml +++ b/examples/UKCore-Observation-NPEWSTotal-Example.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/UKCore-Observation-OxygenTherapy-Example.xml b/examples/UKCore-Observation-OxygenTherapy-Example.xml new file mode 100644 index 00000000..cc3ddb3f --- /dev/null +++ b/examples/UKCore-Observation-OxygenTherapy-Example.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-PipeSmoker-Example.xml b/examples/UKCore-Observation-PipeSmoker-Example.xml new file mode 100644 index 00000000..ce31d64e --- /dev/null +++ b/examples/UKCore-Observation-PipeSmoker-Example.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-VitalSigns-BMI-Example.xml b/examples/UKCore-Observation-VitalSigns-BMI-Example.xml new file mode 100644 index 00000000..33e41692 --- /dev/null +++ b/examples/UKCore-Observation-VitalSigns-BMI-Example.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-VitalSigns-BloodPressure-Example.xml b/examples/UKCore-Observation-VitalSigns-BloodPressure-Example.xml index 72d8c395..7cbcd7b1 100644 --- a/examples/UKCore-Observation-VitalSigns-BloodPressure-Example.xml +++ b/examples/UKCore-Observation-VitalSigns-BloodPressure-Example.xml @@ -7,7 +7,6 @@ - @@ -52,7 +51,7 @@ - + @@ -73,7 +72,7 @@ - + diff --git a/examples/UKCore-Observation-VitalSigns-BodyHeight-Example.xml b/examples/UKCore-Observation-VitalSigns-BodyHeight-Example.xml index 898f5964..d97f7765 100644 --- a/examples/UKCore-Observation-VitalSigns-BodyHeight-Example.xml +++ b/examples/UKCore-Observation-VitalSigns-BodyHeight-Example.xml @@ -29,9 +29,9 @@ - - + + - + \ No newline at end of file diff --git a/examples/UKCore-Observation-VitalSigns-BodyTemperature-Example.xml b/examples/UKCore-Observation-VitalSigns-BodyTemperature-Example.xml new file mode 100644 index 00000000..2ff6bf4c --- /dev/null +++ b/examples/UKCore-Observation-VitalSigns-BodyTemperature-Example.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-VitalSigns-BodyWeight-Example.xml b/examples/UKCore-Observation-VitalSigns-BodyWeight-Example.xml index 342520cb..1590cb49 100644 --- a/examples/UKCore-Observation-VitalSigns-BodyWeight-Example.xml +++ b/examples/UKCore-Observation-VitalSigns-BodyWeight-Example.xml @@ -18,7 +18,7 @@ - + diff --git a/examples/UKCore-Observation-VitalSigns-HeadCircumference-Example.xml b/examples/UKCore-Observation-VitalSigns-HeadCircumference-Example.xml new file mode 100644 index 00000000..85700dfc --- /dev/null +++ b/examples/UKCore-Observation-VitalSigns-HeadCircumference-Example.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-VitalSigns-HeartRate-Example.xml b/examples/UKCore-Observation-VitalSigns-HeartRate-Example.xml new file mode 100644 index 00000000..e44fe108 --- /dev/null +++ b/examples/UKCore-Observation-VitalSigns-HeartRate-Example.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-VitalSigns-OxygenSaturation-Example.xml b/examples/UKCore-Observation-VitalSigns-OxygenSaturation-Example.xml new file mode 100644 index 00000000..49bce75c --- /dev/null +++ b/examples/UKCore-Observation-VitalSigns-OxygenSaturation-Example.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/UKCore-Observation-VitalSigns-RespiratoryRate-Example.xml b/examples/UKCore-Observation-VitalSigns-RespiratoryRate-Example.xml new file mode 100644 index 00000000..59e50cbe --- /dev/null +++ b/examples/UKCore-Observation-VitalSigns-RespiratoryRate-Example.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/structuredefinitions/Extension-UKCore-RecordingSetting.xml b/structuredefinitions/Extension-UKCore-RecordingSetting.xml index e285ece7..85b767fc 100644 --- a/structuredefinitions/Extension-UKCore-RecordingSetting.xml +++ b/structuredefinitions/Extension-UKCore-RecordingSetting.xml @@ -1,60 +1,57 @@ - - - - - - <status value="draft" /> - <date value="2023-09-06" /> - <publisher value="HL7 UK" /> - <contact> - <name value="HL7 UK" /> - <telecom> - <system value="email" /> - <value value="ukcore@hl7.org.uk" /> - <use value="work" /> - <rank value="1" /> - </telecom> - </contact> - <description value="An extension to record the care setting in which an observation was taken." /> - <purpose value="This extension is a clinical observation use case to record the care setting in which an observation was recorded in." /> - <copyright value="Copyright © 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at https://www.hl7.org/fhir/license.html." /> - <fhirVersion value="4.0.1" /> - <kind value="complex-type" /> - <abstract value="false" /> - <context> - <type value="element" /> - <expression value="Observation" /> - </context> - <type value="Extension" /> - <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension" /> - <derivation value="constraint" /> - <differential> - <element id="Extension"> - <path value="Extension" /> - <short value="An extension to record the care setting in which an observation was taken." /> - <definition value="This extension allows the recording of the care setting in which an observation was taken." /> - </element> - <element id="Extension.url"> - <path value="Extension.url" /> - <fixedUri value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-RecordingSetting" /> - </element> - <element id="Extension.value[x]"> - <path value="Extension.value[x]" /> - <short value="A set of codes to record the care setting" /> - <min value="1" /> - <type> - <code value="CodeableConcept" /> - </type> - </element> - <element id="Extension.value[x].coding"> - <path value="Extension.value[x].coding" /> - <binding> - <strength value="preferred" /> - <description value="A set of codes to record the care setting" /> - <valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-RecordingSetting" /> - </binding> - </element> - </differential> + <id value="Extension-UKCore-RecordingSetting"/> + <url value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-RecordingSetting"/> + <version value="1.0.0"/> + <name value="ExtensionUKCoreRecordingSetting"/> + <title value="Extension UK Core Recording Setting"/> + <status value="draft"/> + <date value="2023-09-12"/> + <publisher value="HL7 UK"/> + <contact> + <name value="HL7 UK"/> + <telecom> + <system value="email"/> + <value value="ukcore@hl7.org.uk"/> + <use value="work"/> + <rank value="1"/> + </telecom> + </contact> + <description value="An extension to record the care setting in which an observation was taken."/> + <purpose value="This extension is a clinical observation use case to record the care setting in which an observation was recorded in."/> + <copyright value="Copyright © 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at https://www.hl7.org/fhir/license.html."/> + <fhirVersion value="4.0.1"/> + <kind value="complex-type"/> + <abstract value="false"/> + <context> + <type value="element"/> + <expression value="Observation"/> + </context> + <type value="Extension"/> + <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension"/> + <derivation value="constraint"/> + <differential> + <element id="Extension"> + <path value="Extension"/> + <short value="An extension to record the care setting in which an observation was taken."/> + <definition value="This extension allows the recording of the care setting in which an observation was taken."/> + </element> + <element id="Extension.url"> + <path value="Extension.url"/> + <fixedUri value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-RecordingSetting"/> + </element> + <element id="Extension.value[x]"> + <path value="Extension.value[x]"/> + <short value="A set of codes to record the care setting"/> + <min value="1"/> + <type> + <code value="code"/> + </type> + <binding> + <strength value="preferred"/> + <description value="A set of codes to record the care setting"/> + <valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-RecordingSetting"/> + </binding> + </element> + </differential> </StructureDefinition> diff --git a/structuredefinitions/UKCore-Device-BloodPressure.xml b/structuredefinitions/UKCore-Device-BloodPressure.xml index 211cc6b1..c94667f8 100644 --- a/structuredefinitions/UKCore-Device-BloodPressure.xml +++ b/structuredefinitions/UKCore-Device-BloodPressure.xml @@ -32,7 +32,7 @@ <sliceName value="cuffSize" /> <type> <code value="Extension" /> - <profile value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-BloodPressureCuffSize" /> + <profile value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CuffSize" /> </type> <isModifier value="false" /> </element> diff --git a/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml b/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml index d63165fd..698c06c3 100644 --- a/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml +++ b/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml @@ -95,6 +95,10 @@ <valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-BloodPressure-AverageSystolic" /> </binding> </element> + <element id="Observation.component:SystolicBP.code.text"> + <path value="Observation.component.code.text" /> + <fixedString value="Systolic blood pressure" /> + </element> <element id="Observation.component:SystolicBP.value[x]"> <path value="Observation.component.value[x]" /> <type> @@ -125,6 +129,10 @@ <valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-BloodPressure-AverageDiastolic" /> </binding> </element> + <element id="Observation.component:DiastolicBP.code.text"> + <path value="Observation.component.code.text" /> + <fixedString value="Diastolic blood pressure" /> + </element> <element id="Observation.component:DiastolicBP.value[x]"> <path value="Observation.component.value[x]" /> <type> diff --git a/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml b/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml index 23dabde0..c7fe9dee 100644 --- a/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml +++ b/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml @@ -36,6 +36,14 @@ <min value="1" /> <max value="1" /> </element> + <element id="Observation.category.coding.system"> + <path value="Observation.category.coding.system" /> + <fixedUri value="http://terminology.hl7.org/CodeSystem/observation-category" /> + </element> + <element id="Observation.category.coding.code"> + <path value="Observation.category.coding.code" /> + <fixedCode value="survey" /> + </element> <element id="Observation.code"> <path value="Observation.code" /> <binding> diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml index c320ee78..5c831d13 100644 --- a/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml +++ b/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml @@ -64,11 +64,6 @@ <path value="Observation.value[x].value" /> <min value="1" /> </element> - <element id="Observation.value[x].unit"> - <path value="Observation.value[x].unit" /> - <min value="1" /> - <fixedString value="kilogram / (meter ^ 2)" /> - </element> <element id="Observation.value[x].system"> <path value="Observation.value[x].system" /> <min value="1" /> diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml index 4673c83c..180fd171 100644 --- a/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml +++ b/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml @@ -50,6 +50,7 @@ </element> <element id="Observation.value[x]"> <path value="Observation.value[x]" /> + <min value="1" /> <type> <code value="Quantity" /> </type> diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml index 0652afd3..f995c552 100644 --- a/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml +++ b/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml @@ -50,6 +50,7 @@ </element> <element id="Observation.value[x]"> <path value="Observation.value[x]" /> + <min value="1" /> <type> <code value="Quantity" /> </type> diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml b/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml index 9783ad28..2c3fad96 100644 --- a/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml +++ b/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml @@ -37,7 +37,7 @@ </element> <element id="Observation.code.coding:loinc.display"> <path value="Observation.code.coding.display" /> - <fixedString value=" Head Occipital-frontal circumference" /> + <fixedString value="Head Occipital-frontal circumference" /> </element> <element id="Observation.code.coding:snomedCT"> <path value="Observation.code.coding" /> @@ -50,6 +50,7 @@ </element> <element id="Observation.value[x]"> <path value="Observation.value[x]" /> + <min value="1" /> <type> <code value="Quantity" /> </type> diff --git a/valuesets/ValueSet-UKCore-AlcoholConsumption.xml b/valuesets/ValueSet-UKCore-AlcoholConsumption.xml index ddc05ae0..ce84e111 100644 --- a/valuesets/ValueSet-UKCore-AlcoholConsumption.xml +++ b/valuesets/ValueSet-UKCore-AlcoholConsumption.xml @@ -17,7 +17,7 @@ </telecom> </contact> <description value="A set of codes that define a patients level of consciousness. Selected from the SNOMED CT UK coding system: - - DescendantOrSelfOf 1082641000000106 | Alcohol units consumed per week (observable entity) + - 1082641000000106 | Alcohol units consumed per week (observable entity) - 1082631000000102 | Alcohol units consumed per day (observable entity)"/> <copyright value="Copyright © 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at https://www.hl7.org/fhir/license.html."/> <compose>