diff --git a/.github/workflows/terminology.yml b/.github/workflows/terminology.yml index 5174c15..a6f2ed8 100644 --- a/.github/workflows/terminology.yml +++ b/.github/workflows/terminology.yml @@ -5,7 +5,7 @@ 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: + push: # Allows you to run this workflow manually from the Actions tab diff --git a/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport.json b/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport.json index ca4fa03..6a5aaf5 100644 --- a/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport.json +++ b/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "NHSEngland-Composition-GenomicsEULabReport", "url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport", - "version": "0.3.0", + "version": "0.4.0", "name": "NHSEngland_Composition_GenomicsEULabReport", "title": "NHSEngland Composition GenomicsEULabReport", "status": "active", - "date": "2026-04-16", + "date": "2026-07-15", "publisher": "NHS England", "contact": [ { @@ -32,81 +32,6 @@ "derivation": "constraint", "differential": { "element": [ - { - "id": "Composition.extension:basedOn-order-or-requisition", - "path": "Composition.extension", - "sliceName": "basedOn-order-or-requisition", - "definition": "TBC. Only relevant for EU Lab aligned reports (included in HL7 EU Laboratory Report: Composition Profile). A reference to the ServiceRequest which this report is in response to." - }, - { - "id": "Composition.extension:basedOn-order-or-requisition.value[x]:valueReference", - "path": "Composition.extension.value[x]", - "sliceName": "valueReference", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "https://fhir.nhs.uk/StructureDefinition/NHSEngland-ServiceRequest-Genomics", - "http://hl7.eu/fhir/laboratory/StructureDefinition/ServiceRequest-eu-lab" - ], - "aggregation": [ - "referenced", - "bundled" - ] - } - ] - }, - { - "id": "Composition.extension:information-recipient", - "path": "Composition.extension", - "sliceName": "information-recipient", - "definition": "TBC. Only relevant for EU Lab aligned reports (included in HL7 EU Laboratory Report: Composition Profile). A reference to the recipient for a report, could potentially be used to reference additional recipients over the subject and original requester for the request." - }, - { - "id": "Composition.extension:information-recipient.value[x]", - "path": "Composition.extension.value[x]", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "https://fhir.nhs.uk/StructureDefinition/NHSEngland-PractitionerRole-Genomics", - "http://hl7.eu/fhir/laboratory/StructureDefinition/Practitioner-eu-lab", - "http://hl7.org/fhir/StructureDefinition/Device", - "http://hl7.eu/fhir/laboratory/StructureDefinition/Patient-eu-lab", - "http://hl7.org/fhir/StructureDefinition/RelatedPerson", - "http://hl7.eu/fhir/laboratory/StructureDefinition/PractitionerRole-eu-lab", - "http://hl7.org/fhir/StructureDefinition/Organization" - ], - "aggregation": [ - "referenced", - "bundled" - ] - } - ] - }, - { - "id": "Composition.extension:diagnosticReport-reference", - "path": "Composition.extension", - "sliceName": "diagnosticReport-reference", - "definition": "TBC. Only relevant for EU Lab aligned reports (included in HL7 EU Laboratory Report: Composition Profile). A reference to the focal DiagnosticReport this Composition is for." - }, - { - "id": "Composition.extension:diagnosticReport-reference.value[x]", - "path": "Composition.extension.value[x]", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "https://fhir.nhs.uk/StructureDefinition/NHSEngland-DiagnosticReport-GenomicReport", - "http://hl7.eu/fhir/laboratory/StructureDefinition/DiagnosticReport-eu-lab" - ], - "aggregation": [ - "referenced", - "bundled" - ] - } - ] - }, { "id": "Composition.status", "path": "Composition.status", @@ -131,16 +56,6 @@ "rules": "open" } }, - { - "id": "Composition.type.coding.display.extension:translation", - "path": "Composition.type.coding.display.extension", - "sliceName": "translation" - }, - { - "id": "Composition.type.coding.display.extension:translation.extension", - "path": "Composition.type.coding.display.extension.extension", - "min": 2 - }, { "id": "Composition.type.coding:codingGenomics", "path": "Composition.type.coding", @@ -151,51 +66,11 @@ "display": "Genetic report" } }, - { - "id": "Composition.type.coding:codingGenomics.display.extension:translation", - "path": "Composition.type.coding.display.extension", - "sliceName": "translation" - }, - { - "id": "Composition.type.coding:codingGenomics.display.extension:translation.extension", - "path": "Composition.type.coding.display.extension.extension", - "min": 2 - }, - { - "id": "Composition.type.text.extension:translation", - "path": "Composition.type.text.extension", - "sliceName": "translation" - }, - { - "id": "Composition.type.text.extension:translation.extension", - "path": "Composition.type.text.extension.extension", - "min": 2 - }, { "id": "Composition.category", "path": "Composition.category", "definition": "Fixed codes for conformance to the EU Lab Composition profile (for cross border sharing of lab reports)." }, - { - "id": "Composition.category.coding.display.extension:translation", - "path": "Composition.category.coding.display.extension", - "sliceName": "translation" - }, - { - "id": "Composition.category.coding.display.extension:translation.extension", - "path": "Composition.category.coding.display.extension.extension", - "min": 2 - }, - { - "id": "Composition.category.text.extension:translation", - "path": "Composition.category.text.extension", - "sliceName": "translation" - }, - { - "id": "Composition.category.text.extension:translation.extension", - "path": "Composition.category.text.extension.extension", - "min": 2 - }, { "id": "Composition.category:studyType", "path": "Composition.category", @@ -233,10 +108,9 @@ "code": "Reference", "targetProfile": [ "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Patient-Genomics", - "http://hl7.eu/fhir/laboratory/StructureDefinition/Patient-eu-lab", - "http://hl7.eu/fhir/laboratory/StructureDefinition/Patient-animal-eu-lab", + "http://hl7.eu/fhir/base/StructureDefinition/patient-eu-core", "http://hl7.org/fhir/StructureDefinition/Group", - "http://hl7.org/fhir/StructureDefinition/Location", + "http://hl7.eu/fhir/base/StructureDefinition/location-eu-core", "http://hl7.org/fhir/StructureDefinition/Device" ], "aggregation": [ @@ -267,38 +141,19 @@ "path": "Composition.section", "definition": "To conform to EU Lab, SHOULD include references to the results that form part of the genomic report. For the UGR, will include sections that conform to the UGR folders, this work is currently in development." }, - { - "id": "Composition.section.code.coding.display.extension:translation", - "path": "Composition.section.code.coding.display.extension", - "sliceName": "translation" - }, - { - "id": "Composition.section.code.coding.display.extension:translation.extension", - "path": "Composition.section.code.coding.display.extension.extension", - "min": 2 - }, - { - "id": "Composition.section.code.text.extension:translation", - "path": "Composition.section.code.text.extension", - "sliceName": "translation" - }, - { - "id": "Composition.section.code.text.extension:translation.extension", - "path": "Composition.section.code.text.extension.extension", - "min": 2 - }, { "id": "Composition.section:sectionUGR", "path": "Composition.section", "sliceName": "sectionUGR", - "definition": "Sections included within the UGR: patient-demographics | investigations-and-procedures-requested | investigation-results | consent-for-information-sharing | family-history " + "min": 0, + "max": "*", + "definition": "Sections used to represent UGR folders." }, { "id": "Composition.section:sectionUGR.code", "path": "Composition.section.code", "binding": { "strength": "extensible", - "description": "UK Core Composition Section Codes", "valueSet": "https://fhir.hl7.org.uk/ValueSet/UKCore-CompositionSectionCode" } } diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index cb1c724..500f706 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,19 +1,28 @@ { - "updated": "2026-05-06T10:21:55.9845039+01:00", + "updated": "2026-07-13T13:22:07.8769811+01:00", "dependencies": { - "hl7.fhir.r4.core": "4.0.1", - "hl7.fhir.uv.extensions.r4": "5.3.0-ballot-tc1", - "hl7.fhir.uv.xver-r5.r4": "0.1.0", + "hl7.fhir.r4.core": "4.0.1", "hl7.fhir.uv.genomics-reporting": "3.0.0", - "hl7.fhir.uv.ips": "2.0.0", "hl7.fhir.eu.laboratory": "2.0.0", + "hl7.terminology.r4": "7.1.0", + "hl7.fhir.uv.extensions.r4": "5.2.0", + "hl7.fhir.uv.xver-r5.r4": "0.1.0", + "hl7.fhir.eu.extensions.r4": "1.3.0", + "hl7.fhir.eu.base": "2.0.0", + "ihe.pharm.mpd.r4": "1.0.0-comment-2", "ihe.iti.pcf": "1.1.0", - "hl7.fhir.us.mcode": "4.0.0", + "us.nlm.vsac": "0.9.0", + "ihe.iti.balp": "1.1.4", "fhir.r4.nhsengland.pars": "0.1.2-alpha", + "fhir.r4.nhsengland.nhse-identifiers": "0.1.1-alpha", + "fhir.r4.ukcore.stu2": "2.0.2", + "hl7.fhir.uv.ips": "2.0.0", + "hl7.fhir.uv.ipa": "1.1.0", + "hl7.fhir.uv.smart-app-launch": "2.0.0", + "fhir.r4.nhsengland.stu1": "1.5.0", "fhir.r4.nhsengland.pathology": "0.2.4-alpha", "hl7.fhir.uv.tools.r4": "1.1.2", - "fhir.r4.nhsengland.nhse-identifiers": "0.1.1-alpha", "fhir.r4.ukcore.stu3.currentbuild": "0.29.0-pre-release" }, "missing": {} -} \ No newline at end of file +} diff --git a/package.json b/package.json index ca7e1ce..85b7e92 100644 --- a/package.json +++ b/package.json @@ -3,14 +3,10 @@ "description": "FHIR Genomics Implementation Guide", "author": "nhsdigital", "dependencies": { - "hl7.fhir.r4.core": "4.0.1", - "hl7.fhir.uv.extensions.r4": "5.3.0-ballot-tc1", - "hl7.fhir.uv.xver-r5.r4": "0.1.0", +"hl7.fhir.r4.core": "4.0.1", "hl7.fhir.uv.genomics-reporting": "3.0.0", - "hl7.fhir.uv.ips": "2.0.0", "hl7.fhir.eu.laboratory": "2.0.0", "ihe.iti.pcf": "1.1.0", - "hl7.fhir.us.mcode": "4.0.0", "fhir.r4.nhsengland.pars": "0.1.2-alpha", "fhir.r4.nhsengland.pathology": "0.2.4-alpha", "hl7.fhir.uv.tools.r4": "1.1.2", @@ -21,4 +17,4 @@ "4.0.1" ], "jurisdiction": "urn:iso:std:iso:3166:-2#GB" -} +} \ No newline at end of file diff --git a/private.package.yaml b/private.package.yaml new file mode 100644 index 0000000..1ec8db8 --- /dev/null +++ b/private.package.yaml @@ -0,0 +1,39 @@ +implementationguides: + hl7-fhir-uv-extensions-r4: + name: hl7.fhir.uv.extensions.r4 + version: 5.3.0-ballot-tc1 + installMode: STORE_AND_INSTALL + fetchDependencies: false + hl7-fhir-uv-xver-r5-r4: + name: hl7.fhir.uv.xver-r5.r4 + version: 0.1.0 + installMode: STORE_AND_INSTALL + fetchDependencies: false + hl7-fhir-uv-ips: + name: hl7.fhir.uv.ips + version: 2.0.0 + installMode: STORE_AND_INSTALL + fetchDependencies: false + fhir-r4-nhsengland-pathology: + name: fhir.r4.nhsengland.pathology + version: 0.2.4-alpha + installMode: STORE_AND_INSTALL + fetchDependencies: false + hl7-fhir-uv-tools-r4: + name: hl7.fhir.uv.tools.r4 + version: 1.1.2 + installMode: STORE_AND_INSTALL + fhir-r4-nhsengland-nhse-identifiers: + name: fhir.r4.nhsengland.nhse-identifiers + version: 0.1.1-alpha + installMode: STORE_AND_INSTALL + fetchDependencies: false + hl7.fhir.us.core: + name: hl7.fhir.us.core + version: 6.1.0 + installMode: STORE_AND_INSTALL + hl7.fhir.us.mcode: + name: hl7.fhir.us.mcode + version: 4.0.0 + installMode: STORE_AND_INSTALL + fetchDependencies: false \ No newline at end of file