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/.simplifier/quality.control.result.json b/.simplifier/quality.control.result.json new file mode 100644 index 0000000..d601e3d --- /dev/null +++ b/.simplifier/quality.control.result.json @@ -0,0 +1,88 @@ +{ + "Timestamp": "2026-07-09T09:44:07.7997291+00:00", + "Series": "custom", + "Type": "Simplifier", + "Files": [ + { + "Issues": [ + { + "Location": "Bundle.entry[15].resource[0].status[0]", + "Severity": 0, + "System": "http://hl7.org/fhir/dotnet-api-operation-outcome", + "Code": "6007", + "Message": "Code \u0027proposed\u0027 does not exist in the value set \u0027ConsentState\u0027 (http://hl7.org/fhir/ValueSet/consent-state-codes)" + } + ], + "Tag": null, + "Length": 20237, + "Hash": "324DA175E551D271451BEAC7D15A0B96", + "FilePath": "Bundle\\Bundle-WGSTestOrderForm-Example.json" + }, + { + "Issues": [ + { + "Location": "Consent.status[0]", + "Severity": 0, + "System": "http://hl7.org/fhir/dotnet-api-operation-outcome", + "Code": "6007", + "Message": "Code \u0027proposed\u0027 does not exist in the value set \u0027ConsentState\u0027 (http://hl7.org/fhir/ValueSet/consent-state-codes)" + } + ], + "Tag": null, + "Length": 2292, + "Hash": "8F31D47A3B8EE844E177A31DD65DE94B", + "FilePath": "Consent\\Consent-DataSharing-Example.json" + }, + { + "Issues": [ + { + "Location": "Consent.status[0]", + "Severity": 0, + "System": "http://hl7.org/fhir/dotnet-api-operation-outcome", + "Code": "6007", + "Message": "Code \u0027proposed\u0027 does not exist in the value set \u0027ConsentState\u0027 (http://hl7.org/fhir/ValueSet/consent-state-codes)" + } + ], + "Tag": null, + "Length": 978, + "Hash": "C5A05E29B88833E7385BADEE24DE9341", + "FilePath": "Consent\\Consent-RoDToFollow-Example.json" + }, + { + "Issues": [ + { + "Location": "Questionnaire.item[11].item[0].type[0]", + "Severity": 0, + "System": "http://hl7.org/fhir/dotnet-api-operation-outcome", + "Code": "6007", + "Message": "Code \u0027choice\u0027 does not exist in the value set \u0027QuestionnaireItemType\u0027 (http://hl7.org/fhir/ValueSet/item-type)" + }, + { + "Location": "Questionnaire.item[12].item[0].item[0].type[0]", + "Severity": 0, + "System": "http://hl7.org/fhir/dotnet-api-operation-outcome", + "Code": "6007", + "Message": "Code \u0027choice\u0027 does not exist in the value set \u0027QuestionnaireItemType\u0027 (http://hl7.org/fhir/ValueSet/item-type)" + }, + { + "Location": "Questionnaire.item[12].item[0].item[1].type[0]", + "Severity": 0, + "System": "http://hl7.org/fhir/dotnet-api-operation-outcome", + "Code": "6007", + "Message": "Code \u0027choice\u0027 does not exist in the value set \u0027QuestionnaireItemType\u0027 (http://hl7.org/fhir/ValueSet/item-type)" + }, + { + "Location": "Questionnaire.item[12].item[0].item[2].type[0]", + "Severity": 0, + "System": "http://hl7.org/fhir/dotnet-api-operation-outcome", + "Code": "6007", + "Message": "Code \u0027choice\u0027 does not exist in the value set \u0027QuestionnaireItemType\u0027 (http://hl7.org/fhir/ValueSet/item-type)" + } + ], + "Tag": null, + "Length": 16828, + "Hash": "6BBF706E18038DCBE5E14182FD5ED272", + "FilePath": "Questionnaire\\NHSDigital-Questionnaire-Genomics-Example.json" + } + ] +} \ No newline at end of file diff --git a/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport.json b/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport.json index c31e397..1441b21 100644 --- a/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport.json +++ b/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport.json @@ -38,6 +38,25 @@ "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.url", + "path": "Composition.extension.url", + "fixedUri": "basedOn-order-or-requisition" + }, + { + "id": "Composition.extension:basedOn-order-or-requisition.value[x]", + "path": "Composition.extension.value[x]", + "slicing": { + "discriminator": [ + { + "type": "type", + "path": "$this" + } + ], + "ordered": false, + "rules": "open" + } + }, { "id": "Composition.extension:basedOn-order-or-requisition.value[x]:valueReference", "path": "Composition.extension.value[x]", @@ -62,6 +81,11 @@ "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.url", + "path": "Composition.extension.url", + "fixedUri": "information-recipient" + }, { "id": "Composition.extension:information-recipient.value[x]", "path": "Composition.extension.value[x]", @@ -90,6 +114,11 @@ "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.url", + "path": "Composition.extension.url", + "fixedUri": "diagnosticReport-reference" + }, { "id": "Composition.extension:diagnosticReport-reference.value[x]", "path": "Composition.extension.value[x]", @@ -137,9 +166,9 @@ "sliceName": "translation" }, { - "id": "Composition.type.coding.display.extension:translation.extension", - "path": "Composition.type.coding.display.extension.extension", - "min": 2 + "id": "Composition.type.coding.display.extension:translation.url", + "path": "Composition.type.coding.display.extension.url", + "fixedUri": "translation" }, { "id": "Composition.type.coding:codingGenomics", @@ -157,9 +186,9 @@ "sliceName": "translation" }, { - "id": "Composition.type.coding:codingGenomics.display.extension:translation.extension", - "path": "Composition.type.coding.display.extension.extension", - "min": 2 + "id": "Composition.type.coding:codingGenomics.display.extension:translation.url", + "path": "Composition.type.coding.display.extension.url", + "fixedUri": "translation" }, { "id": "Composition.type.text.extension:translation", @@ -167,9 +196,9 @@ "sliceName": "translation" }, { - "id": "Composition.type.text.extension:translation.extension", - "path": "Composition.type.text.extension.extension", - "min": 2 + "id": "Composition.type.text.extension:translation.url", + "path": "Composition.type.text.extension.url", + "fixedUri": "translation" }, { "id": "Composition.category", @@ -185,9 +214,9 @@ "sliceName": "translation" }, { - "id": "Composition.category.coding.display.extension:translation.extension", - "path": "Composition.category.coding.display.extension.extension", - "min": 2 + "id": "Composition.category.coding.display.extension:translation.url", + "path": "Composition.category.coding.display.extension.url", + "fixedUri": "translation" }, { "id": "Composition.category.text.extension:translation", @@ -195,9 +224,9 @@ "sliceName": "translation" }, { - "id": "Composition.category.text.extension:translation.extension", - "path": "Composition.category.text.extension.extension", - "min": 2 + "id": "Composition.category.text.extension:translation.url", + "path": "Composition.category.text.extension.url", + "fixedUri": "translation" }, { "id": "Composition.category:studyType", @@ -279,9 +308,9 @@ "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.coding.display.extension:translation.url", + "path": "Composition.section.code.coding.display.extension.url", + "fixedUri": "translation" }, { "id": "Composition.section.code.text.extension:translation", @@ -289,9 +318,9 @@ "sliceName": "translation" }, { - "id": "Composition.section.code.text.extension:translation.extension", - "path": "Composition.section.code.text.extension.extension", - "min": 2 + "id": "Composition.section.code.text.extension:translation.url", + "path": "Composition.section.code.text.extension.url", + "fixedUri": "translation" }, { "id": "Composition.section:sectionUGR", diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index 1237a67..be36194 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,19 +1,35 @@ { - "updated": "2026-05-06T10:21:55.9845039+01:00", + "updated": "2026-07-09T10:40:46.1671248+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", + "ihe.iti.balp": "1.1.4", "hl7.fhir.us.mcode": "4.0.0", + "hl7.fhir.us.core": "6.1.0", + "hl7.fhir.uv.bulkdata": "2.0.0", + "hl7.fhir.uv.smart-app-launch": "2.1.0", + "us.nlm.vsac": "0.11.0", + "hl7.fhir.uv.sdc": "3.0.0", + "hl7.fhir.r4.examples": "4.0.1", + "us.cdc.phinvads": "0.12.0", + "ihe.formatcode.fhir": "1.1.0", "fhir.r4.nhsengland.pars": "0.1.2-alpha", - "fhir.r4.nhsengland.pathology": "0.1.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" + "fhir.r4.ukcore.stu2": "2.0.2", + "hl7.fhir.uv.ips": "2.0.0", + "hl7.fhir.uv.ipa": "1.1.0", + "fhir.r4.nhsengland.stu1": "1.5.0", + "hl7.fhir.uv.tools.r4": "1.1.2", + "fhir.r4.ukcore.stu3.currentbuild": "0.29.0-pre-release", + "fhir.r4.nhsengland.pathology": "0.2.4-alpha" }, "missing": {} -} \ No newline at end of file +} diff --git a/package.json b/package.json index 6510d2f..19bdf49 100644 --- a/package.json +++ b/package.json @@ -4,18 +4,14 @@ "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.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.1.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" + "fhir.r4.ukcore.stu3.currentbuild": "0.29.0-pre-release", + "fhir.r4.nhsengland.pathology": "0.2.4-alpha" }, "fhirVersions": [ "4.0.1" diff --git a/private.package.yaml b/private.package.yaml new file mode 100644 index 0000000..789b101 --- /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.1.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