diff --git a/.github/workflows/QualityControlChecker.yml b/.github/workflows/QualityControlChecker.yml index 16a0e50d..fa377f36 100644 --- a/.github/workflows/QualityControlChecker.yml +++ b/.github/workflows/QualityControlChecker.yml @@ -14,4 +14,4 @@ on: jobs: # This workflow contains a single job called "call-workflow" which references the FHIR validator repo call-workflow: - uses: NHSDigital/IOPS-FHIR-Test-Scripts/.github/workflows/QualityControlCheckerUKCore.yml@main + uses: NHSDigital/IOPS-FHIR-Test-Scripts/.github/workflows/QualityControlChecker.yml@main diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index bfeb283c..00000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,54 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Firely Validation - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - # mf - extend to develop & feature branches - # mf - commented out and left to manual trigger to test - # push: - # branches: [ master, main, develop, feature/* ] - # pull_request: - # branches: [ master, main ] - - # Allows you to run this workflow manually from the Actions tab - # mf - added develop & feature/* branches in manual trigger to test - workflow_dispatch: - branches: [ master, main, develop, feature/* ] - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - - # Validate all resources using Firely Terminal - CI_FHIR_VALIDATION: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - name: Checkout code - uses: actions/checkout@v2 - - # Install .NET runtime - - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v1.7.2 - with: - dotnet-version: 3.1.x - - # Install Java runtime (only needed if you want to run the offical HL7 Java validator) - - name: Setup Java JDK - uses: actions/setup-java@v1.4.3 - with: - java-version: 1.8 - - - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.2.1 - with: - SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} - SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} - PATH_TO_CONFORMANCE_RESOURCES: codesystems conceptmaps structuredefinitions valuesets - PATH_TO_EXAMPLES: examples - DOTNET_VALIDATION_ENABLED: true - JAVA_VALIDATION_ENABLED: true - EXPECTED_FAILS: VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA diff --git a/.github/workflows/validation-no-terminology.yml b/.github/workflows/validation-no-terminology.yml deleted file mode 100644 index 9c7cc33e..00000000 --- a/.github/workflows/validation-no-terminology.yml +++ /dev/null @@ -1,96 +0,0 @@ -name: IOPS-FHIR-Validation-No-Terminology - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the master branch - # Allows you to run this workflow manually from the Actions tab - - push: - - workflow_dispatch: - - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - with: - submodules: true - - - name: Check out IOPS-Validation - uses: actions/checkout@master - with: - repository: NHSDigital/IOPS-Validation - path: validation - - - name: Check out validation-service-fhir-r4 - uses: actions/checkout@master - with: - repository: NHSDigital/validation-service-fhir-r4 - ref: testing - path: validation-service-fhir-r4 - - - name: Install Python 3.8 - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - - name: Upgrade python packaging tools - run: python -m pip install --upgrade pip setuptools wheel - - - name: Install poetry and requests - run: pip install poetry requests - - - name: Install dependencies - run: poetry install - - - name: Set SPEC_VERSION env var - run: echo ::set-env name=SPEC_VERSION::$(poetry run python scripts/calculate_version.py) - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - - - name: Set up JDK 11 - uses: actions/setup-java@v2 - with: - java-version: '11' - distribution: 'adopt' - - - name: Install node - run: | - wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - curl -sL https://deb.nodesource.com/setup_13.x | sudo -E bash - - sudo apt-get install -y nodejs - - - name: Cache node modules - uses: actions/cache@v1 - with: - path: ~/.npm - key: ${{ runner.os }}-build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }} - - - name: Install npm - run: make -C validation install - - - name: Configure FHIR Validator - run: make -C validation configure-validation - env: - CI: true - ONTO_CLIENT_ID: ${{ secrets.ONTO_CLIENT_ID }} - ONTO_CLIENT_SECRET: ${{ secrets.ONTO_CLIENT_SECRET }} - - - name: Build FHIR Validator - run: cd validation-service-fhir-r4 && mvn clean package - - - name: Run FHIR Validator - run: - nohup java -jar validation-service-fhir-r4/target/fhir-validator-0.0.1-SNAPSHOT.jar & - sleep 60 - - - name: Run Test - run: make -C validation test diff --git a/README.md b/README.md index 5ace65ec..8ae8cd09 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # FHIR-R4-UKCORE-STAGING-MAIN +This repository is maintained by [Interoperability Team]( https://nhsd-confluence.digital.nhs.uk/pages/viewpage.action?spaceKey=IOPS&title=Interoperability+Standards) Any queries contact us via [email]( interoperabilityteam@nhs.net). UK Core Repository of FHIR Assets for HL7 FHIR® UK Core Implementation Guide [Simplifier project](https://simplifier.net/hl7fhirukcorer4). diff --git a/codesystems/CodeSystem-UKCore-DateTimeType.xml b/codesystems/CodeSystem-UKCore-DateTimeType.xml index 33f8b5d1..e345f444 100644 --- a/codesystems/CodeSystem-UKCore-DateTimeType.xml +++ b/codesystems/CodeSystem-UKCore-DateTimeType.xml @@ -1,11 +1,11 @@ - + <status value="draft" /> - <date value="2021-09-10" /> + <date value="2023-10-13" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -85,4 +85,9 @@ <display value="Clock Stop Date Time"/> <definition value="The date/time that the first response arrived at the incident location that counts as the arrival time based on the National Ambulance Quality Indicator definitions"/> </concept> + <concept> + <code value="last-changed-date"/> + <display value="Last Changed Date"/> + <definition value="The date/time that the data was last changed"/> + </concept> </CodeSystem> diff --git a/codesystems/CodeSystem-UKCore-LegalStatusClassificationWales.xml b/codesystems/CodeSystem-UKCore-LegalStatusClassificationWales.xml index 939150a6..aa01789d 100644 --- a/codesystems/CodeSystem-UKCore-LegalStatusClassificationWales.xml +++ b/codesystems/CodeSystem-UKCore-LegalStatusClassificationWales.xml @@ -46,7 +46,7 @@ </concept> <concept> <code value="07" /> - <display value="Formally detained under Mental Health Act Section 35 (Remand to hospital for report on accused’s mental condition)" /> + <display value="Formally detained under Mental Health Act Section 35 (Remand to hospital for report on accused's mental condition)" /> </concept> <concept> <code value="08" /> diff --git a/codesystems/CodeSystem-UKCore-MedicationRequestCategory.xml b/codesystems/CodeSystem-UKCore-MedicationRequestCategory.xml index 9e3aa233..0d886207 100644 --- a/codesystems/CodeSystem-UKCore-MedicationRequestCategory.xml +++ b/codesystems/CodeSystem-UKCore-MedicationRequestCategory.xml @@ -1,34 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> <CodeSystem xmlns="http://hl7.org/fhir"> -<id value="UKCore-MedicationRequestCategory"/> - <url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-MedicationRequestCategory"/> - <version value="1.1.0" /> - <name value="UKCoreMedicationRequestCategory"/> - <title value="UK Core Medication Request Category"/> - <status value="active" /> - <date value="2022-12-16" /> - <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="A set of codes to define additional category concepts for a medication request."/> - <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." /> - <caseSensitive value="true"/> - <content value="complete"/> - <concept> - <code value="leave"/> - <display value="Leave"/> - <definition value="Requests for medications that the patient will take away with him/her during any short break from inpatient care. Typically requests would be dispensed by the hospital pharmacy to be self-administered at home with or without the assistance of community based nursing staff."/> - </concept> - <concept> - <code value="primarycare"/> - <display value="Primary Care"/> - <definition value="Requests for medications originating in a primary care setting. Typically requests would be dispensed by the patients nominated pharmacy to be self-administered at home with or without the assistance of community based nursing staff."/> - </concept> + <id value="UKCore-MedicationRequestCategory"/> + <url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-MedicationRequestCategory"/> + <version value="1.1.1"/> + <name value="UKCoreMedicationRequestCategory"/> + <title value="UK Core Medication Request Category"/> + <status value="active"/> + <date value="2023-10-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="A set of codes to define additional category concepts for a medication request."/> + <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."/> + <caseSensitive value="true"/> + <content value="complete"/> + <concept> + <code value="leave"/> + <display value="Leave"/> + <definition value="Requests for medications that the patient will take away with him/her during any short break from inpatient care. Typically requests would be dispensed by the hospital pharmacy to be self-administered at home with or without the assistance of community based nursing staff."/> + </concept> + <concept> + <code value="primarycare"/> + <display value="Primary Care"/> + <definition value="Requests for medications originating in a primary care setting. Typically requests would be dispensed by the patients nominated pharmacy to be self-administered at home with or without the assistance of community based nursing staff."/> + <property> + <code value="inactive"/> + <valueBoolean value="True"/> + </property> + </concept> </CodeSystem> diff --git a/codesystems/CodeSystem-UKCore-PeriodType.xml b/codesystems/CodeSystem-UKCore-PeriodType.xml new file mode 100644 index 00000000..a25a4b78 --- /dev/null +++ b/codesystems/CodeSystem-UKCore-PeriodType.xml @@ -0,0 +1,31 @@ +<CodeSystem xmlns="http://hl7.org/fhir"> + <id value="UKCore-PeriodType"/> + <url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PeriodType"/> + <version value="1.0.0"/> + <name value="UKCorePeriodType"/> + <title value="UK Core Period Type"/> + <status value="draft" /> + <date value="2023-10-13" /> + <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="CodeSystem to identify the type of period data being recorded."/> + <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." /> + <caseSensitive value="true"/> + <content value="complete"/> + <concept> + <code value="legal"/> + <display value="Legal"/> + </concept> + <concept> + <code value="operational"/> + <display value="Operational"/> + </concept> +</CodeSystem> diff --git a/codesystems/CodeSystem-UKCore-PreferredContactMethod.xml b/codesystems/CodeSystem-UKCore-PreferredContactMethod.xml index a82e136a..6f29e610 100644 --- a/codesystems/CodeSystem-UKCore-PreferredContactMethod.xml +++ b/codesystems/CodeSystem-UKCore-PreferredContactMethod.xml @@ -2,11 +2,11 @@ <CodeSystem xmlns="http://hl7.org/fhir"> <id value="UKCore-PreferredContactMethod" /> <url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredContactMethod" /> - <version value="2.1.0" /> + <version value="2.2.0" /> <name value="UKCorePreferredContactMethod" /> <title value="UK Core Preferred Contact Method" /> <status value="active" /> - <date value="2021-09-10" /> + <date value="2023-10-09" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -17,7 +17,7 @@ <rank value="1" /> </telecom> </contact> - <description value="A CodeSystem to identify the preferred contact method of a patient, contact or related person." /> + <description value="A set of codes to identify the preferred contact method of a patient, contact or related person. These codes and their descriptions represent common communication methods and are originally sourced from the removed [NHS Data Dictionary PreferredContactMethod](https://data.developer.nhs.uk/dms/mim/3.1.09/Vocabulary/PreferredContactMethod.htm) list. SMS added 10/10/2023 for Galleri / Grail usage with a sequential code ID." /> <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." /> <caseSensitive value="true" /> <content value="complete" /> @@ -53,4 +53,8 @@ <code value="8" /> <display value="No Telephone contact" /> </concept> + <concept> + <code value="9" /> + <display value="SMS" /> + </concept> </CodeSystem> diff --git a/examples/UKCore-AllergyIntolerance-Sn-TransferDegradDrugAllergy-Example.xml b/examples/UKCore-AllergyIntolerance-Sn-TransferDegradedDrugAllergy-Example.xml similarity index 91% rename from examples/UKCore-AllergyIntolerance-Sn-TransferDegradDrugAllergy-Example.xml rename to examples/UKCore-AllergyIntolerance-Sn-TransferDegradedDrugAllergy-Example.xml index 27ce3408..55cdc6e5 100644 --- a/examples/UKCore-AllergyIntolerance-Sn-TransferDegradDrugAllergy-Example.xml +++ b/examples/UKCore-AllergyIntolerance-Sn-TransferDegradedDrugAllergy-Example.xml @@ -1,5 +1,5 @@ <AllergyIntolerance xmlns="http://hl7.org/fhir"> - <id value="UKCore-AllergyIntolerance-Sn-TransferDegradDrugAllergy-Example"/> + <id value="UKCore-AllergyIntolerance-Sn-TransferDegradedDrugAllergy-Example"/> <clinicalStatus> <coding> <system value="http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical"/> diff --git a/examples/UKCore-Extension-BodySiteReference-Example.xml b/examples/UKCore-Extension-BodySiteReference-Example.xml index 46097e71..19278753 100644 --- a/examples/UKCore-Extension-BodySiteReference-Example.xml +++ b/examples/UKCore-Extension-BodySiteReference-Example.xml @@ -26,7 +26,7 @@ </coding> </method> <bodySite> - <!-- Use of the bodySite R5 backport extension to reference a BodyStucture, in this case, the draw site. --> + <!-- Use of the bodySite R5 backport extension to reference a BodyStructure, in this case, the draw site. --> <extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-BodySiteReference"> <valueReference> <reference value="BodyStructure/UKCore-BodyStructure-MedianCubitalVeinExample"/> diff --git a/examples/UKCore-HealthcareService-OrthopaedicService-Example.xml b/examples/UKCore-HealthcareService-OrthopaedicService-Example.xml index d12aa74a..07b2a4c0 100644 --- a/examples/UKCore-HealthcareService-OrthopaedicService-Example.xml +++ b/examples/UKCore-HealthcareService-OrthopaedicService-Example.xml @@ -51,7 +51,7 @@ <coding> <system value="http://terminology.hl7.org/CodeSystem/service-provision-conditions"/> <code value="free"/> - <display value=" This service is available for no patient cost."/> + <display value="This service is available for no patient cost."/> </coding> </serviceProvisionCode> <program> diff --git a/examples/UKCore-Medication-Sn-TransferDegradMedEntry-Example.xml b/examples/UKCore-Medication-Sn-TransferDegradedMedEntry-Example.xml similarity index 84% rename from examples/UKCore-Medication-Sn-TransferDegradMedEntry-Example.xml rename to examples/UKCore-Medication-Sn-TransferDegradedMedEntry-Example.xml index c1ea5c41..f4f21692 100644 --- a/examples/UKCore-Medication-Sn-TransferDegradMedEntry-Example.xml +++ b/examples/UKCore-Medication-Sn-TransferDegradedMedEntry-Example.xml @@ -1,5 +1,5 @@ <Medication xmlns="http://hl7.org/fhir"> - <id value="UKCore-Medication-Sn-TransferDegradMedEntry-Example"/> + <id value="UKCore-Medication-Sn-TransferDegradedMedEntry-Example"/> <!-- **************Snippet start************** --> <code> <coding> diff --git a/structuredefinitions/Extension-UKCore-AnaestheticIssues.xml b/structuredefinitions/Extension-UKCore-AnaestheticIssues.xml index 52c97bec..a72d0ebd 100644 --- a/structuredefinitions/Extension-UKCore-AnaestheticIssues.xml +++ b/structuredefinitions/Extension-UKCore-AnaestheticIssues.xml @@ -47,8 +47,8 @@ </element> <element id="Extension.value[x]"> <path value="Extension.value[x]" /> - <short value="Snomed Concept or a link to the Condition resource" /> - <definition value="Snomed Concept or a link to the Condition resource." /> + <short value="SNOMED CT Concept or a link to the Condition resource" /> + <definition value="SNOMED CT Concept or a link to the Condition resource." /> <min value="1" /> <type> <code value="CodeableConcept" /> diff --git a/structuredefinitions/Extension-UKCore-TypedDateTime.xml b/structuredefinitions/Extension-UKCore-TypedDateTime.xml index 5a703982..e07b8e02 100644 --- a/structuredefinitions/Extension-UKCore-TypedDateTime.xml +++ b/structuredefinitions/Extension-UKCore-TypedDateTime.xml @@ -2,11 +2,11 @@ <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="Extension-UKCore-TypedDateTime" /> <url value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-TypedDateTime" /> - <version value="2.1.0" /> + <version value="2.2.0" /> <name value="ExtensionUKCoreTypedDateTime" /> <title value="Extension UK Core Typed Date Time" /> <status value="draft" /> - <date value="2021-09-10" /> + <date value="2023-10-13" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -19,7 +19,7 @@ </contact> <description value="This supports the exchange of dates and/or times. The extension date and/or time is carried along with a code to identify the type of date and/or time." /> <purpose value="This extension extends the Encounter and the Communication resources to support the exchange of information describing the specific business related date and/or time." /> - <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." /> + <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" /> <mapping> <identity value="rim" /> @@ -36,6 +36,14 @@ <type value="element" /> <expression value="Communication" /> </context> + <context> + <type value="element" /> + <expression value="Organization" /> + </context> + <context> + <type value="element" /> + <expression value="OrganizationAffiliation" /> + </context> <type value="Extension" /> <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension" /> <derivation value="constraint" /> @@ -47,13 +55,7 @@ </element> <element id="Extension.extension"> <path value="Extension.extension" /> - <slicing> - <discriminator> - <type value="value" /> - <path value="url" /> - </discriminator> - <rules value="open" /> - </slicing> + <min value="2" /> </element> <element id="Extension.extension:dateTimeType"> <path value="Extension.extension" /> @@ -107,4 +109,4 @@ <max value="0" /> </element> </differential> -</StructureDefinition> +</StructureDefinition> \ No newline at end of file diff --git a/structuredefinitions/Extension-UKCore-TypedPeriod.xml b/structuredefinitions/Extension-UKCore-TypedPeriod.xml new file mode 100644 index 00000000..6dfb43dd --- /dev/null +++ b/structuredefinitions/Extension-UKCore-TypedPeriod.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8"?> +<StructureDefinition xmlns="http://hl7.org/fhir"> + <id value="Extension-UKCore-TypedPeriod" /> + <url value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-TypedPeriod" /> + <version value="1.0.0" /> + <name value="ExtensionUKCoreTypedPeriod" /> + <title value="Extension UK Core Typed Period" /> + <status value="draft" /> + <date value="2023-10-13" /> + <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="This supports the exchange of time periods. The extension time period is carried along with a code to identify whether the data is record for legal or operational periods." /> + <purpose value="This extension has been created from an ODS use-case in which there is a requirement to hold data for Legal and Operational dates, although it is expected to be broader than ODS and can be used for other scenarios." /> + <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" /> + <mapping> + <identity value="rim" /> + <uri value="http://hl7.org/v3" /> + <name value="RIM Mapping" /> + </mapping> + <kind value="complex-type" /> + <abstract value="false" /> + <context> + <type value="element" /> + <expression value="Organization" /> + </context> + <context> + <type value="element" /> + <expression value="OrganizationAffiliation" /> + </context> + <type value="Extension" /> + <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension" /> + <derivation value="constraint" /> + <differential> + <element id="Extension"> + <path value="Extension" /> + <short value="This supports the recording of a period related to the specified date type." /> + <definition value="This supports the recording of a period related to the specified date type. The period is carried along with a code to identify the type of data." /> + </element> + <element id="Extension.extension"> + <path value="Extension.extension" /> + <min value="2" /> + </element> + <element id="Extension.extension:dataType"> + <path value="Extension.extension" /> + <sliceName value="dataType" /> + <short value="Whether the Date Period is 'Legal' or 'Operational'." /> + <min value="1" /> + <max value="1" /> + </element> + <element id="Extension.extension:dataType.url"> + <path value="Extension.extension.url" /> + <fixedUri value="dataType" /> + </element> + <element id="Extension.extension:dataType.value[x]"> + <path value="Extension.extension.value[x]" /> + <short value="A ValueSet to identify the type of period." /> + <min value="1" /> + <type> + <code value="CodeableConcept" /> + </type> + <binding> + <strength value="extensible" /> + <description value="The type of period data." /> + <valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-PeriodType" /> + </binding> + </element> + <element id="Extension.extension:period"> + <path value="Extension.extension" /> + <sliceName value="period" /> + <short value="The specific business related date or time period." /> + <min value="1" /> + <max value="1" /> + </element> + <element id="Extension.extension:period.url"> + <path value="Extension.extension.url" /> + <fixedUri value="period" /> + </element> + <element id="Extension.extension:period.value[x]"> + <path value="Extension.extension.value[x]" /> + <short value="The date or time period." /> + <min value="1" /> + <type> + <code value="Period" /> + </type> + </element> + <element id="Extension.url"> + <path value="Extension.url" /> + <fixedUri value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-TypedPeriod" /> + </element> + <element id="Extension.value[x]"> + <path value="Extension.value[x]" /> + <max value="0" /> + </element> + </differential> +</StructureDefinition> \ No newline at end of file diff --git a/valuesets/ValueSet-UKCore-BloodPressure-DeviceType.xml b/valuesets/ValueSet-UKCore-BloodPressure-DeviceType.xml index e918d013..d3b668b0 100644 --- a/valuesets/ValueSet-UKCore-BloodPressure-DeviceType.xml +++ b/valuesets/ValueSet-UKCore-BloodPressure-DeviceType.xml @@ -16,7 +16,7 @@ <rank value="1" /> </telecom> </contact> - <description value="A code from the SNOMED CT UK coding system for the typoe of device used to measure blood pressure. Selected from the SNOMED CT UK coding system: + <description value="A code from the SNOMED CT UK coding system for the type of device used to measure blood pressure. Selected from the SNOMED CT UK coding system: - 43770009 | Doppler device (physical object) - 469801002 | Invasive blood pressure monitor (physical object) - 258057004 | Non-invasive blood pressure monitor (physical object) diff --git a/valuesets/ValueSet-UKCore-DateTimeType.xml b/valuesets/ValueSet-UKCore-DateTimeType.xml index db748547..39f33bb9 100644 --- a/valuesets/ValueSet-UKCore-DateTimeType.xml +++ b/valuesets/ValueSet-UKCore-DateTimeType.xml @@ -1,27 +1,103 @@ <?xml version="1.0" encoding="UTF-8"?> <ValueSet xmlns="http://hl7.org/fhir"> -<id value="UKCore-DateTimeType"/> + <id value="UKCore-DateTimeType"/> <url value="https://fhir.hl7.org.uk/ValueSet/UKCore-DateTimeType"/> - <version value="2.0.0"/> + <version value="2.1.0"/> <name value="UKCoreDateTimeType"/> <title value="UK Core Date Time Type"/> - <status value="draft" /> - <date value="2021-09-10" /> - <publisher value="HL7 UK" /> + <status value="draft"/> + <date value="2023-10-13"/> + <publisher value="HL7 UK"/> <contact> - <name value="HL7 UK" /> + <name value="HL7 UK"/> <telecom> - <system value="email" /> - <value value="ukcore@hl7.org.uk" /> - <use value="work" /> - <rank value="1" /> + <system value="email"/> + <value value="ukcore@hl7.org.uk"/> + <use value="work"/> + <rank value="1"/> </telecom> </contact> <description value="A ValueSet to identify the type of date and time being recorded."/> - <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." /> + <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> - <include> - <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType" /> - </include> - </compose> + <include> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + </include> + </compose> + <expansion> + <identifier value="84af73b0-8078-4323-be5e-43ced75666fb"/> + <timestamp value="2023-10-13T13:27:44+00:00"/> + <total value="14"/> + <offset value="0"/> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-resource-arrived-on-scene"/> + <display value="Time Resource Arrived On Scene"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-call-ended"/> + <display value="Time Call Ended"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-clear"/> + <display value="Time Clear"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-arrived-receiving-location"/> + <display value="Time Arrived at Receiving Location"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-resource-left-scene"/> + <display value="Time Resource Left Scene"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-dispatch-code-established"/> + <display value="Time Dispatch Code Established"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-stood-down"/> + <display value="Time Stood Down"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="clock-start-date-time"/> + <display value="Clock Start Date Time"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-resource-mobilised"/> + <display value="Time Resource Mobilised"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="clock-stop-date-time"/> + <display value="Clock Stop Date Time"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-clinical-handover"/> + <display value="Time of Clinical Handover"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-call-answered"/> + <display value="Time Call Answered"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="time-patient-handover"/> + <display value="Time Patient Handover"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/> + <code value="last-changed-date"/> + <display value="Last Changed Date"/> + </contains> + </expansion> </ValueSet> diff --git a/valuesets/ValueSet-UKCore-LegalStatusClassification.xml b/valuesets/ValueSet-UKCore-LegalStatusClassification.xml index 44ce98c9..b677da1b 100644 --- a/valuesets/ValueSet-UKCore-LegalStatusClassification.xml +++ b/valuesets/ValueSet-UKCore-LegalStatusClassification.xml @@ -123,7 +123,7 @@ <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-LegalStatusClassificationWales"/> <version value="1.0.0"/> <code value="07"/> - <display value="Formally detained under Mental Health Act Section 35 (Remand to hospital for report on accused’s mental condition)"/> + <display value="Formally detained under Mental Health Act Section 35 (Remand to hospital for report on accused's mental condition)"/> </contains> <contains> <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-LegalStatusClassificationEngland"/> diff --git a/valuesets/ValueSet-UKCore-MedicationRequestCategory.xml b/valuesets/ValueSet-UKCore-MedicationRequestCategory.xml index 4b3e5306..a1e44ab8 100644 --- a/valuesets/ValueSet-UKCore-MedicationRequestCategory.xml +++ b/valuesets/ValueSet-UKCore-MedicationRequestCategory.xml @@ -1,11 +1,11 @@ <ValueSet xmlns="http://hl7.org/fhir"> <id value="UKCore-MedicationRequestCategory"/> <url value="https://fhir.hl7.org.uk/ValueSet/UKCore-MedicationRequestCategory"/> - <version value="1.1.0" /> + <version value="1.1.1" /> <name value="UKCoreMedicationRequestCategory"/> <title value="UK Core Medication Request Category"/> <status value="active" /> - <date value="2022-12-16" /> + <date value="2023-10-06" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -28,7 +28,7 @@ </compose> <expansion> <identifier value="242c10eb-0ecc-47b2-9f97-78e80577a16e"/> - <timestamp value="2021-09-09T14:37:59+00:00"/> + <timestamp value="2023-10-06T13:57:59+00:00"/> <total value="6"/> <offset value="0"/> <contains> @@ -60,6 +60,7 @@ <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-MedicationRequestCategory"/> <code value="primarycare"/> <display value="Primary Care"/> + <inactive value="True"/> </contains> </expansion> </ValueSet> diff --git a/valuesets/ValueSet-UKCore-PeriodType.xml b/valuesets/ValueSet-UKCore-PeriodType.xml new file mode 100644 index 00000000..4a12e7fd --- /dev/null +++ b/valuesets/ValueSet-UKCore-PeriodType.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ValueSet xmlns="http://hl7.org/fhir"> + <id value="UKCore-PeriodType"/> + <url value="https://fhir.hl7.org.uk/ValueSet/UKCore-PeriodType"/> + <version value="1.0.0"/> + <name value="UKCorePeriodType"/> + <title value="UK Core Period Type"/> + <status value="draft"/> + <date value="2023-10-13"/> + <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="A ValueSet to identify the type of period data being recorded."/> + <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> + <include> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PeriodType"/> + </include> + </compose> + <expansion> + <identifier value="94af73b0-8078-4323-be5e-43ced75666fb"/> + <timestamp value="2023-10-13T13:34:44+00:00"/> + <total value="2"/> + <offset value="0"/> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PeriodType"/> + <code value="legal"/> + <display value="Legal"/> + </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PeriodType"/> + <code value="operational"/> + <display value="Operational"/> + </contains> + </expansion> +</ValueSet> diff --git a/valuesets/ValueSet-UKCore-PreferredContactMethod.xml b/valuesets/ValueSet-UKCore-PreferredContactMethod.xml index 26ab559b..868369ff 100644 --- a/valuesets/ValueSet-UKCore-PreferredContactMethod.xml +++ b/valuesets/ValueSet-UKCore-PreferredContactMethod.xml @@ -2,11 +2,11 @@ <ValueSet xmlns="http://hl7.org/fhir"> <id value="UKCore-PreferredContactMethod"/> <url value="https://fhir.hl7.org.uk/ValueSet/UKCore-PreferredContactMethod"/> - <version value="2.1.0" /> + <version value="2.2.0" /> <name value="UKCorePreferredContactMethod"/> <title value="UK Core Preferred Contact Method"/> <status value="active" /> - <date value="2021-09-10" /> + <date value="2023-10-09" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -27,7 +27,7 @@ <expansion> <identifier value="4dc72d2e-fcbd-4590-9864-56d0724c62fc"/> <timestamp value="2021-09-10T07:33:41+00:00"/> - <total value="8"/> + <total value="9"/> <offset value="0"/> <parameter> <name value="version"/> @@ -81,5 +81,10 @@ <code value="2"/> <display value="Visit"/> </contains> + <contains> + <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredContactMethod"/> + <code value="9"/> + <display value="SMS"/> + </contains> </expansion> </ValueSet>