diff --git a/.github/workflows/firely-validation.yml b/.github/workflows/firely-validation.yml new file mode 100644 index 00000000..08f10b1d --- /dev/null +++ b/.github/workflows/firely-validation.yml @@ -0,0 +1,59 @@ +# 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 + push: + #branches: [ master, main ] + + pull_request: + #branches: [ master, main ] + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# 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@v6 + + # Install .NET runtime + - name: Setup .NET Core SDK + uses: actions/setup-dotnet@v5 + with: + dotnet-version: 8.0.x + + # Install Java runtime (only needed if you want to run the offical HL7 Java validator) + - name: Setup Java JDK + uses: actions/setup-java@v5 + with: + distribution: 'microsoft' + java-version: '21' + + - name: Firely.Terminal (GitHub Actions) + uses: FirelyTeam/firely-terminal-pipeline@v0.7.31 + with: + PATH_TO_CONFORMANCE_RESOURCES: StructureDefinition ValueSet CodeSystem + PATH_TO_EXAMPLES: ActivityDefinition AuditEvent BodyStructure Bundle CapabilityStatement Composition ConceptMap Condition Consent Device DiagnosticReport DocumentReference FamilyMemberHistory GraphDefinition Group Library MessageDefinition MessageHeader NamingSystem Observation OperationDefinition OperationOutcome Organization Parameters Patient PlanDefinition Practitioner PractitionerRole Procedure Provenance Questionnaire QuestionnaireResponse RelatedPerson RequestGroup SearchParameter ServiceRequest Specimen SpecimenDefinition StructureMap Subscription Task + PATH_TO_QUALITY_CONTROL_RULES: custom + DOTNET_VALIDATION_ENABLED: true + JAVA_VALIDATION_ENABLED: false + #EXPECTED_FAILS: VALIDATION_EXAMPLES_JAVA + SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} + SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} + FIRELY_TERMINAL_VERSION: 3.5.0 + SUSHI_ENABLED: false + + # - name: Add & Commit. + # uses: EndBug/add-and-commit@v9 + # with: + # add: 'fsh-generated/resources/' \ No newline at end of file diff --git a/.gitignore b/.gitignore index f77ca908..475fc106 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ validation IOPS-validation validation-service-fhir-r4 .idea/workspace.xml +StructureMap/StructureMap-MedicationRepeatInformation-Extension-3to4.json diff --git a/ConceptMap/ConceptMap-bsa-prescription-type-to-mim-organisation-type.json b/ConceptMap/ConceptMap-bsa-prescription-type-to-mim-organisation-type.json index bb9f609e..9e7c3527 100644 --- a/ConceptMap/ConceptMap-bsa-prescription-type-to-mim-organisation-type.json +++ b/ConceptMap/ConceptMap-bsa-prescription-type-to-mim-organisation-type.json @@ -27,6 +27,7 @@ "group": [ { "source": "https://fhir.nhs.uk/CodeSystem/prescription-type", + "sourceVersion": "1.2.0", "target": "https://fhir.nhs.uk/CodeSystem/mim-organisation-type", "element": [ { diff --git a/ConceptMap/MedicationRequest-course-therapy-type-map.xml b/ConceptMap/MedicationRequest-course-therapy-type-map.xml index bf132719..fa4c49cc 100644 --- a/ConceptMap/MedicationRequest-course-therapy-type-map.xml +++ b/ConceptMap/MedicationRequest-course-therapy-type-map.xml @@ -18,10 +18,10 @@ - + - + diff --git a/Examples/SDS-Device-Bundle-Example.xml b/Examples/SDS-Device-Bundle-Example.xml index 624fe433..ceb3c22d 100644 --- a/Examples/SDS-Device-Bundle-Example.xml +++ b/Examples/SDS-Device-Bundle-Example.xml @@ -4,10 +4,10 @@ - + - + diff --git a/Examples/SDS-Endpoint-Bundle-Example.xml b/Examples/SDS-Endpoint-Bundle-Example.xml index 20bb1498..8d5ea19b 100644 --- a/Examples/SDS-Endpoint-Bundle-Example.xml +++ b/Examples/SDS-Endpoint-Bundle-Example.xml @@ -4,10 +4,10 @@ - + - + diff --git a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml new file mode 100644 index 00000000..a59348be --- /dev/null +++ b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MessageDefinition/MessageDefinition-document.xml b/MessageDefinition/MessageDefinition-document.xml index 25ce7e4c..ffb4f462 100644 --- a/MessageDefinition/MessageDefinition-document.xml +++ b/MessageDefinition/MessageDefinition-document.xml @@ -10,12 +10,12 @@ <status value="active" /> <date value="2021-04-23" /> + <description value="Used to exchange a clinical document. One of FHIR Binary or FHIR Bundle (type=document) is required. If a Binary is supplied a DocumentReference MUST also be supplied."/> <eventCoding> <system value="https://fhir.nhs.uk/CodeSystem/message-event" /> <code value="document" /> <display value="Document" /> </eventCoding> - <description value="Used to exchange a clinical document. One of FHIR Binary or FHIR Bundle (type=document) is required. If a Binary is supplied a DocumentReference MUST also be supplied."/> <category value="consequence" /> <focus> <code value="DocumentReference" /> diff --git a/MessageDefinition/MessageDefinition-prescription-order.xml b/MessageDefinition/MessageDefinition-prescription-order.xml index 01a16ccf..b8705a42 100644 --- a/MessageDefinition/MessageDefinition-prescription-order.xml +++ b/MessageDefinition/MessageDefinition-prescription-order.xml @@ -10,8 +10,8 @@ <title value="Pharmacy/Treatment Order" /> <status value="active" /> <date value="2020-05-27" /> + <description value="Ordering of medications"/> <base value="https://fhir.hl7.org.uk/MessageDefinition/prescription-order" /> - <description value="Ordering of medications"/> <eventCoding> <system value="https://fhir.nhs.uk/CodeSystem/message-event" /> <code value="prescription-order" /> diff --git a/NamingSystem/prescription-type-ns.xml b/NamingSystem/prescription-type-ns.xml deleted file mode 100644 index 0f4e48e1..00000000 --- a/NamingSystem/prescription-type-ns.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<NamingSystem xmlns="http://hl7.org/fhir"> - <id value="prescription-type-ns"/> - <name value="Prescriptiontypens"/> - <status value="draft"/> - <kind value="codesystem"/> - <date value="2020-06-01"/> - <publisher value="NHS Digital"/> - <responsible value="NHS Digital"/> - <description value="Describes the type of prescription this is."/> - <usage value="EPS"/> - <uniqueId> - <type value="uri"/> - <value value="https://fhir.nhs.uk/CodeSystem/prescription-type"/> - <preferred value="true"/> - </uniqueId> - <uniqueId> - <type value="oid"/> - <value value="2.16.840.1.113883.2.1.3.2.4.17.25"/> - <preferred value="false"/> - </uniqueId> -</NamingSystem> \ No newline at end of file diff --git a/NamingSystem/ukcore-prescription-type-ns.xml b/NamingSystem/ukcore-prescription-type-ns.xml deleted file mode 100644 index 3906808b..00000000 --- a/NamingSystem/ukcore-prescription-type-ns.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<NamingSystem xmlns="http://hl7.org/fhir"> - <id value="ukcore-prescription-type-ns"/> - <name value="UKcoreprescriptiontypens"/> - <status value="draft"/> - <kind value="codesystem"/> - <date value="2020-06-01"/> - <publisher value="NHS Digital"/> - <responsible value="NHS Digital"/> - <description value="The management reasons for a prescription being issued."/> - <usage value="EPS"/> - <uniqueId> - <type value="uri"/> - <value value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PrescriptionType"/> - <preferred value="true"/> - </uniqueId> - <uniqueId> - <type value="uri"/> - <value value="https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-PrescriptionType-1"/> - <preferred value="false"/> - </uniqueId> -</NamingSystem> \ No newline at end of file diff --git a/OperationDefinition/MedicationRequest-lock.json b/OperationDefinition/MedicationRequest-lock.json index 6defceec..857b3e0e 100644 --- a/OperationDefinition/MedicationRequest-lock.json +++ b/OperationDefinition/MedicationRequest-lock.json @@ -28,8 +28,6 @@ "system": false, "type": false, "instance": true, - "inputProfile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Task", - "outputProfile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-OperationOutcome", "parameter": [ { "name": "content", diff --git a/OperationDefinition/MedicationRequest-unlock.json b/OperationDefinition/MedicationRequest-unlock.json index 198a7f47..0f6472f7 100644 --- a/OperationDefinition/MedicationRequest-unlock.json +++ b/OperationDefinition/MedicationRequest-unlock.json @@ -28,8 +28,6 @@ "system": false, "type": false, "instance": true, - "inputProfile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Task", - "outputProfile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-OperationOutcome", "parameter": [ { "name": "content", diff --git a/OperationDefinition/MessageHeader-prepare-message.xml b/OperationDefinition/MessageHeader-prepare-message.xml index f8ece070..eca36421 100644 --- a/OperationDefinition/MessageHeader-prepare-message.xml +++ b/OperationDefinition/MessageHeader-prepare-message.xml @@ -14,10 +14,10 @@ </telecom> </contact> <description value="Convert a prescription in FHIR format into the canonicalised HL7 V3 signature fragments which should be signed by the prescriber." /> + <affectsState value="true" /> <code value="prepare" /> <comment value="This operation does not use the parameters resource for input parameters, it does for the response. \n\n A server may return one of several status codes: \n\n * **200 OK**: Indicates that the message has been fully processed." /> <system value="true" /> - <affectsState value="true" /> <type value="false" /> <instance value="false" /> <parameter> diff --git a/OperationDefinition/OperationDefinition-patientRegistration.json b/OperationDefinition/OperationDefinition-patientRegistration.json index e2cc2d52..721e732c 100644 --- a/OperationDefinition/OperationDefinition-patientRegistration.json +++ b/OperationDefinition/OperationDefinition-patientRegistration.json @@ -31,7 +31,6 @@ "system": false, "type": true, "instance": false, - "outputProfile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-OperationOutcome", "parameter": [ { "name": "identifier", diff --git a/OperationDefinition/OperationDefinition-prescription-release.xml b/OperationDefinition/OperationDefinition-prescription-release.xml index 7472e171..63484342 100644 --- a/OperationDefinition/OperationDefinition-prescription-release.xml +++ b/OperationDefinition/OperationDefinition-prescription-release.xml @@ -17,14 +17,13 @@ </telecom> </contact> <description value="Use this operation to download prescriptions from Spine before it is dispensed. You can download a single prescription using the prescription's ID, or download up to 25 prescriptions (per request) nominated to a dispenser using the dispenser's ODS code. The operation will return prescriptions passing signature validation as a collection of Prescription-Order bundles and/or error messages for Prescriptions failing signature validation as a collection of OperationOutcome resources (with the prescription-order messages attached as supportingInfo"></description> + <affectsState value="true" /> <code value="release"></code> <comment value="Only one of the parameters group-identifier and owner MUST be provided. This operation performs both a query on the message queue and updates the status of returned prescriptions."></comment> - <affectsState value="true" /> <resource value="Task"></resource> <system value="false"></system> <type value="true"></type> <instance value="false"></instance> - <outputProfile value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Bundle-Collection"/> <parameter> <name value="group-identifier"></name> <use value="in"></use> diff --git a/OperationDefinition/OperationDefinition-processMessage.json b/OperationDefinition/OperationDefinition-processMessage.json index c796a2d8..d5dd293a 100644 --- a/OperationDefinition/OperationDefinition-processMessage.json +++ b/OperationDefinition/OperationDefinition-processMessage.json @@ -28,8 +28,6 @@ "type": false, "instance": false, "affectsState": true, - "inputProfile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Bundle-FHIRMessage", - "outputProfile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-OperationOutcome", "parameter": [ { "name": "content", diff --git a/OperationDefinition/OperationDefinition-release.xml b/OperationDefinition/OperationDefinition-release.xml index d78a5d6e..73fdabf7 100644 --- a/OperationDefinition/OperationDefinition-release.xml +++ b/OperationDefinition/OperationDefinition-release.xml @@ -17,14 +17,13 @@ </telecom> </contact> <description value="Use this endpoint to download prescriptions from Spine before it is dispensed. You can download a single prescription using the prescription's ID, or download up to 25 prescriptions (per request) nominated to a dispenser using the dispenser's ODS code."></description> + <affectsState value="true" /> <code value="release"></code> <comment value="Only one of the parameters group-identifier and owner MUST be provided. This operation performs both a query on the message queue and updates the status of returned prescriptions."></comment> - <affectsState value="true" /> <resource value="Task"></resource> <system value="false"></system> <type value="true"></type> <instance value="false"></instance> - <outputProfile value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Bundle-SearchSet"/> <parameter> <name value="group-identifier"></name> <use value="in"></use> diff --git a/StructureDefinition/CodeableReferenceExtension.StructureDefinition.xml b/StructureDefinition/CodeableReferenceExtension.StructureDefinition.xml index 5416907c..ec4a72d7 100644 --- a/StructureDefinition/CodeableReferenceExtension.StructureDefinition.xml +++ b/StructureDefinition/CodeableReferenceExtension.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="009f1275-37dc-4239-abe2-86b8cfaffdea" /> <url value="https://fhir.nhs.uk/StructureDefinition/CodeableReference" /> <name value="CodeableReferenceBackport" /> <status value="draft" /> diff --git a/StructureDefinition/England-Parameters-SubscriptionStatus.StructureDefinition.xml b/StructureDefinition/England-Parameters-SubscriptionStatus.StructureDefinition.xml index 5ea5a0b1..44cbb288 100644 --- a/StructureDefinition/England-Parameters-SubscriptionStatus.StructureDefinition.xml +++ b/StructureDefinition/England-Parameters-SubscriptionStatus.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="bf5f35d6-6338-4e61-9715-82735311f14e" /> <url value="https://fhir.nhs.uk/StructureDefinition/England-Parameters-SubscriptionStatus" /> <name value="EnglandParametersSubscriptionStatus" /> <status value="draft" /> diff --git a/StructureDefinition/England-Slot.StructureDefinition.xml b/StructureDefinition/England-Slot.StructureDefinition.xml index 0dd72e54..62e0be44 100644 --- a/StructureDefinition/England-Slot.StructureDefinition.xml +++ b/StructureDefinition/England-Slot.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="E51b65c95-9671-4c87-a892-419e8745fe1a" /> <url value="https://fhir.nhs.uk/StructureDefinition/England-Slot" /> <name value="EnglandSlot" /> <status value="draft" /> diff --git a/StructureDefinition/England-Subscription.StructureDefinition.xml b/StructureDefinition/England-Subscription.StructureDefinition.xml index 85f17efb..4e0c329b 100644 --- a/StructureDefinition/England-Subscription.StructureDefinition.xml +++ b/StructureDefinition/England-Subscription.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="53df5edc-8d56-449b-bc10-dbea9158b0c4" /> <url value="https://fhir.nhs.uk/StructureDefinition/England-Subscription" /> <name value="EnglandSubscription" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-EPS-DispenseReleaseInformation.StructureDefinition.xml b/StructureDefinition/Extension-EPS-DispenseReleaseInformation.StructureDefinition.xml index b7b43949..b7dff987 100644 --- a/StructureDefinition/Extension-EPS-DispenseReleaseInformation.StructureDefinition.xml +++ b/StructureDefinition/Extension-EPS-DispenseReleaseInformation.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="e7849210-55af-4ac3-a22f-c2b0f71c7136" /> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-EPS-DispensingReleaseInformation" /> <name value="ExtensionEPSDispenseReleaseInformation" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-EPS-Prescription.StructureDefinition.xml b/StructureDefinition/Extension-EPS-Prescription.StructureDefinition.xml index 5b159b25..941684a2 100644 --- a/StructureDefinition/Extension-EPS-Prescription.StructureDefinition.xml +++ b/StructureDefinition/Extension-EPS-Prescription.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="5f2b68b2-b510-4218-8690-d789de7c567f" /> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-EPS-Prescription" /> <name value="ExtensionEPSPrescription" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-ERS-Referral.StructureDefinition.xml b/StructureDefinition/Extension-ERS-Referral.StructureDefinition.xml index 042eff04..1aaee727 100644 --- a/StructureDefinition/Extension-ERS-Referral.StructureDefinition.xml +++ b/StructureDefinition/Extension-ERS-Referral.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="45b632bd-bfdb-45ca-971c-3f097e523933"/> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-ERS-Referral" /> <name value="ExtensionERSAdviceAndGuidance" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-NHSDigital-Account-code.StructureDefinition.xml b/StructureDefinition/Extension-NHSDigital-Account-code.StructureDefinition.xml index 9a71b18b..bd6e2ffa 100644 --- a/StructureDefinition/Extension-NHSDigital-Account-code.StructureDefinition.xml +++ b/StructureDefinition/Extension-NHSDigital-Account-code.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="ea113d7f-0740-4c80-8ad7-b81d80dbf871"/> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-NHSDigital-Account-code" /> <name value="ExtensionNHSDigitalAccountCode" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Examples.StructureDefinition.xml b/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Examples.StructureDefinition.xml index 879e7c5c..b2c7b687 100644 --- a/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Examples.StructureDefinition.xml +++ b/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Examples.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="2ffbe0d7-11a9-44fe-9e76-347b07dd85a9"/> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Examples" /> <name value="ExtensionCapabilityStatementExamples" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Package.xml b/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Package.xml index bcdb6c7d..296ab31f 100644 --- a/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Package.xml +++ b/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Package.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="9ada17f7-4979-4659-a14a-9c5f4d576a31"/> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-NHSDigital-CapabilityStatement-Package" /> <name value="ExtensionCapabilityStatementPackage" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-NHSDigital-CapabilityStatement-QueryParameters.xml b/StructureDefinition/Extension-NHSDigital-CapabilityStatement-QueryParameters.xml index a18c7f7a..5b9138a1 100644 --- a/StructureDefinition/Extension-NHSDigital-CapabilityStatement-QueryParameters.xml +++ b/StructureDefinition/Extension-NHSDigital-CapabilityStatement-QueryParameters.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="9ada17f7-4979-4659-a14a-9c5f4d576a31"/> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-NHSDigital-CapabilityStatement-QueryParameters" /> <name value="ExtensionCapabilityStatementQueryParameters" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-NHSDigital-Provenance-agent.StructureDefinition.xml b/StructureDefinition/Extension-NHSDigital-Provenance-agent.StructureDefinition.xml index bfdadf2e..e6c0cf03 100644 --- a/StructureDefinition/Extension-NHSDigital-Provenance-agent.StructureDefinition.xml +++ b/StructureDefinition/Extension-NHSDigital-Provenance-agent.StructureDefinition.xml @@ -2,8 +2,8 @@ <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="67329733-af3b-40f1-95f8-a83812dc0a43" /> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-Provenance-agent" /> - <name value="ExtensionProvenanceAgent" /> <version value="1.0.1" /> + <name value="ExtensionProvenanceAgent" /> <status value="draft" /> <date value="2024-08-14T13:51:00+00:00" /> <fhirVersion value="4.0.1" /> diff --git a/StructureDefinition/Extension-Portal-Link.StructureDefinition.xml b/StructureDefinition/Extension-Portal-Link.StructureDefinition.xml index 7bf58e05..5bdfa7a4 100644 --- a/StructureDefinition/Extension-Portal-Link.StructureDefinition.xml +++ b/StructureDefinition/Extension-Portal-Link.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="69eddd42-9eb7-4f64-a431-1ca5d01e10a7" /> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-Portal-Link" /> <name value="ExtensionPortalLink" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-ServiceRequest-Priority.StructureDefinition.xml b/StructureDefinition/Extension-ServiceRequest-Priority.StructureDefinition.xml index e0e9dfa1..f316a27e 100644 --- a/StructureDefinition/Extension-ServiceRequest-Priority.StructureDefinition.xml +++ b/StructureDefinition/Extension-ServiceRequest-Priority.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="b536e1be-760c-4ee6-8901-642fb3a41cfc" /> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-ServiceRequest-Priority" /> <name value="ExtensionServiceRequestPriority" /> <status value="draft" /> diff --git a/StructureDefinition/Extension-Spine-OperationOutcome-supportingInformation-prescription.xml b/StructureDefinition/Extension-Spine-OperationOutcome-supportingInformation-prescription.xml index d2dd19a8..1a0e5b36 100644 --- a/StructureDefinition/Extension-Spine-OperationOutcome-supportingInformation-prescription.xml +++ b/StructureDefinition/Extension-Spine-OperationOutcome-supportingInformation-prescription.xml @@ -22,7 +22,7 @@ <expression value="OperationOutcome" /> </context> <type value="Extension" /> - <baseDefinition value="https://fhir.nhs.uk/StructureDefinition/Extension-Spine-supportingInfo" /> + <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension" /> <derivation value="constraint" /> <differential> <element id="Extension"> diff --git a/StructureDefinition/Extension-eRS-ServiceRequest-State.StructureDefinition.xml b/StructureDefinition/Extension-eRS-ServiceRequest-State.StructureDefinition.xml index 3e5fab9c..22045b2d 100644 --- a/StructureDefinition/Extension-eRS-ServiceRequest-State.StructureDefinition.xml +++ b/StructureDefinition/Extension-eRS-ServiceRequest-State.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="8910f758-abaa-4dd6-8020-b7651d7d3365"/> <url value="https://fhir.nhs.uk/StructureDefinition/Extension-eRS-ServiceRequest-State" /> <name value="ExtensionNHSDigitaleRSReferralState" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Appointment-PatientCare.StructureDefinition.xml b/StructureDefinition/NHSDigital-Appointment-PatientCare.StructureDefinition.xml index 1dd51506..7b14dd28 100644 --- a/StructureDefinition/NHSDigital-Appointment-PatientCare.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Appointment-PatientCare.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="ad5f4bd6-22ae-4298-b278-fcccfffe9ba9"/> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Appointment-PatientCare" /> <name value="NHSDigitalAppointmentPatientCare" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Appointment.StructureDefinition.xml b/StructureDefinition/NHSDigital-Appointment.StructureDefinition.xml index 9fc863d9..7f7936f9 100644 --- a/StructureDefinition/NHSDigital-Appointment.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Appointment.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="6baf8ac4-1c7e-4b5c-b70c-178f6b84411f"/> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Appointment" /> <name value="NHSDigitalAppointment" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Binary.StructureDefinition.xml b/StructureDefinition/NHSDigital-Binary.StructureDefinition.xml index 95bd9117..0c08395a 100644 --- a/StructureDefinition/NHSDigital-Binary.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Binary.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="a876618d-c0be-484e-9002-12f45fb99eab"/> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Binary" /> <name value="NHSDigitalBinary" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Bundle-FHIRMessage.StructureDefinition.xml b/StructureDefinition/NHSDigital-Bundle-FHIRMessage.StructureDefinition.xml index be454d6f..63528520 100644 --- a/StructureDefinition/NHSDigital-Bundle-FHIRMessage.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Bundle-FHIRMessage.StructureDefinition.xml @@ -66,7 +66,7 @@ <min value="1" /> <mustSupport value="true" /> </element> - <element id="Bundle.entry.resource:messageHeader"> + <element id="Bundle.entry:messageHeader.resource"> <path value="Bundle.entry.resource" /> <type> <code value="Resource" /> @@ -74,15 +74,15 @@ </type> <mustSupport value="true" /> </element> - <element id="Bundle.entry.search"> + <element id="Bundle.entry:messageHeader.search"> <path value="Bundle.entry.search" /> <max value="0" /> </element> - <element id="Bundle.entry.request"> + <element id="Bundle.entry:messageHeader.request"> <path value="Bundle.entry.request" /> <max value="0" /> </element> - <element id="Bundle.entry.response"> + <element id="Bundle.entry:messageHeader.response"> <path value="Bundle.entry.response" /> <max value="0" /> </element> diff --git a/StructureDefinition/NHSDigital-CapabilityStatement.StructureDefinition.xml b/StructureDefinition/NHSDigital-CapabilityStatement.StructureDefinition.xml index 71fd5d6d..ba847827 100644 --- a/StructureDefinition/NHSDigital-CapabilityStatement.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-CapabilityStatement.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> + <id value="ce95f58a-3ec9-4add-ba98-ed099f9f57c5" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-CapabilityStatement" /> <name value="NHSDigitalCapabilityStatement" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Condition.StructureDefinition.xml b/StructureDefinition/NHSDigital-Condition.StructureDefinition.xml index a69dc194..972dd3e2 100644 --- a/StructureDefinition/NHSDigital-Condition.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Condition.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> + <id value="b57139c8-c8d5-45c5-9554-8e349cb732b2" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition" /> <name value="NHSDigitalCondition" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-DocumentReference-NRL.StructureDefinition.xml b/StructureDefinition/NHSDigital-DocumentReference-NRL.StructureDefinition.xml index ed6a80a3..ebbf8a38 100644 --- a/StructureDefinition/NHSDigital-DocumentReference-NRL.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-DocumentReference-NRL.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> + <id value="328f526e-ec94-4acd-9d3a-c1eb31adce7f" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-DocumentReference-NRL" /> <name value="NHSDigitalDocumentReferenceNRL" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Dosage.StructureDefinition.xml b/StructureDefinition/NHSDigital-Dosage.StructureDefinition.xml index f006462b..fdfe164a 100644 --- a/StructureDefinition/NHSDigital-Dosage.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Dosage.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="e35e53e1-1b57-405f-a616-cf92e1872766" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Dosage" /> <name value="NHSDigitalDosage" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Flag.StructureDefinition.xml b/StructureDefinition/NHSDigital-Flag.StructureDefinition.xml index 647115ab..e944c62a 100644 --- a/StructureDefinition/NHSDigital-Flag.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Flag.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="931147dc-ec2f-4ce8-a603-fe6652091ed0" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Flag" /> <name value="NHSDigitalFlag" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-HealthcareService-PatientCare.StructureDefinition.xml b/StructureDefinition/NHSDigital-HealthcareService-PatientCare.StructureDefinition.xml index 93b019d9..9063e015 100644 --- a/StructureDefinition/NHSDigital-HealthcareService-PatientCare.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-HealthcareService-PatientCare.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="3e844f1a-918b-4f8f-a931-d7a1a2893a5e" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-HealthcareService-PatientCare" /> <name value="NHSDigitalHealthcareServicePatientCare" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-ImmunizationRecommendation.StructureDefinition.xml b/StructureDefinition/NHSDigital-ImmunizationRecommendation.StructureDefinition.xml index 904194ff..b0ad2929 100644 --- a/StructureDefinition/NHSDigital-ImmunizationRecommendation.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-ImmunizationRecommendation.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="c1bae4bf-33a7-4a69-abd3-8c918f3ca525" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-ImmunizationRecommendation" /> <name value="NHSDigitalImmunizationRecommendation" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Location.StructureDefinition.xml b/StructureDefinition/NHSDigital-Location.StructureDefinition.xml index e3fdf83b..65f682ef 100644 --- a/StructureDefinition/NHSDigital-Location.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Location.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="995ef941-6629-4804-9a1b-4b3603ec13d8" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Location" /> <name value="NHSDigitalLocation" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Logical-Event.StructureDefinition.xml b/StructureDefinition/NHSDigital-Logical-Event.StructureDefinition.xml index da37cb2b..a3cea498 100644 --- a/StructureDefinition/NHSDigital-Logical-Event.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Logical-Event.StructureDefinition.xml @@ -7,20 +7,17 @@ <fhirVersion value="4.0.1" /> <kind value="logical" /> <abstract value="false" /> - <type value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Logical-Event" /> + <type value="https://fhir.nhs.uk/StructureDefinition/NHSDigitalLogicalEvent" /> <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Element" /> <derivation value="specialization" /> <differential> - <element id="NHSDigital-Logical-Event"> - <path value="NHSDigital-Logical-Event" /> - <min value="0" /> - <max value="*" /> - <type> - <code value="Element" /> - </type> - </element> - <element id="NHSDigital-Logical-Event.identifier"> - <path value="NHSDigital-Logical-Event.identifier" /> + <element id ="NHSDigitalLogicalEvent" > + <path value="NHSDigitalLogicalEvent" /> + <min value="0" /> + <max value="1" /> + </element> + <element id="NHSDigitalLogicalEvent.identifier"> + <path value="NHSDigitalLogicalEvent.identifier" /> <short value="Business Identifier for {{title}}" /> <min value="1" /> <max value="*" /> @@ -29,18 +26,17 @@ <profile value="http://hl7.org/fhir/StructureDefinition/Identifier" /> </type> </element> - <element id="NHSDigital-Logical-Event.status"> - <path value="NHSDigital-Logical-Event.status" /> + <element id="NHSDigitalLogicalEvent.status"> + <path value="NHSDigitalLogicalEvent.status" /> <short value="Event status" /> <min value="1" /> <max value="1" /> <type> <code value="code" /> - <profile value="http://hl7.org/fhir/StructureDefinition/code" /> </type> </element> - <element id="NHSDigital-Logical-Event.code"> - <path value="NHSDigital-Logical-Event.code" /> + <element id="code"> + <path value="NHSDigitalLogicalEvent.code" /> <short value="What was done (recommended)" /> <min value="0" /> <max value="1" /> @@ -49,8 +45,8 @@ <profile value="http://hl7.org/fhir/StructureDefinition/CodeableConcept" /> </type> </element> - <element id="NHSDigital-Logical-Event.subject"> - <path value="NHSDigital-Logical-Event.subject" /> + <element id="NHSDigitalLogicalEvent.subject"> + <path value="NHSDigitalLogicalEvent.subject" /> <min value="1" /> <max value="1" /> <type> @@ -58,8 +54,8 @@ <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient" /> </type> </element> - <element id="NHSDigital-Logical-Event.encounter"> - <path value="NHSDigital-Logical-Event.encounter" /> + <element id="NHSDigitalLogicalEvent.encounter"> + <path value="NHSDigitalLogicalEvent.encounter" /> <short value="Encounter created as part of (recommended)" /> <min value="0" /> <max value="1" /> @@ -68,13 +64,13 @@ <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-Encounter" /> </type> </element> - <element id="NHSDigital-Logical-Event.performer"> - <path value="NHSDigital-Logical-Event.performer" /> + <element id="performer"> + <path value="NHSDigitalLogicalEvent.performer" /> <min value="1" /> <max value="*" /> <type> - <code value="BackboneElement" /> - <profile value="http://hl7.org/fhir/StructureDefinition/BackboneElement" /> + <code value="Reference" /> + <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/Practitioner" /> </type> </element> </differential> diff --git a/StructureDefinition/NHSDigital-Logical-Request.StructureDefinition.xml b/StructureDefinition/NHSDigital-Logical-Request.StructureDefinition.xml index 655d6915..eb47c377 100644 --- a/StructureDefinition/NHSDigital-Logical-Request.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Logical-Request.StructureDefinition.xml @@ -1,36 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="745e2135-9b3c-4c0c-a3f7-5f22961db23a" /> - <url value="https://fhir.nhs.uk/fhir/StructureDefinition/NHSDigital-Logical-Request" /> + <url value="https://fhir.nhs.uk/fhir/StructureDefinition/NHSDigitalLogicalRequest" /> <name value="NHSDigitalLogicalRequest" /> <status value="draft" /> <fhirVersion value="4.0.1" /> <kind value="logical" /> <abstract value="false" /> - <type value="https://fhir.nhs.uk/fhir/StructureDefinition/UKCore-Request" /> + <type value="https://fhir.nhs.uk/fhir/StructureDefinition/NHSDigitalLogicalRequest" /> <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Element" /> <derivation value="specialization" /> <differential> - <element id="UKCore-Request"> - <path value="UKCore-Request" /> + <element id="NHSDigitalLogicalRequest"> + <path value="NHSDigitalLogicalRequest" /> <min value="0" /> - <max value="*" /> - <type> - <code value="Element" /> - </type> + <max value="1" /> </element> - <element id="UKCore-Request.identifier"> - <path value="UKCore-Request.identifier" /> + <element id="NHSDigitalLogicalRequest.identifier"> + <path value="NHSDigitalLogicalRequest.identifier" /> <definition value="At least one identifier MUST be provided." /> <min value="1" /> <max value="*" /> <type> <code value="Identifier" /> - <profile value="http://hl7.org/fhir/StructureDefinition/Identifier" /> </type> </element> - <element id="UKCore-Request.subject"> - <path value="UKCore-Request.subject" /> + <element id="NHSDigitalLogicalRequest.subject"> + <path value="NHSDigitalLogicalRequest.subject" /> <definition value="reference should be provided identifier (NHS Number) MUST be provided (if traced), it is not permitted to exchange untraced NHS Numbers" /> <min value="1" /> <max value="1" /> @@ -39,8 +35,8 @@ <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient" /> </type> </element> - <element id="UKCore-Request.requester"> - <path value="UKCore-Request.requester" /> + <element id="NHSDigitalLogicalRequest.requester"> + <path value="NHSDigitalLogicalRequest.requester" /> <min value="1" /> <max value="1" /> <type> @@ -51,8 +47,8 @@ <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-PractitionerRole" /> </type> </element> - <element id="UKCore-Request.code"> - <path value="UKCore-Request.code" /> + <element id="NHSDigitalLogicalRequest.code"> + <path value="NHSDigitalLogicalRequest.code" /> <min value="1" /> <max value="1" /> <type> @@ -60,8 +56,8 @@ <profile value="http://hl7.org/fhir/StructureDefinition/CodeableConcept" /> </type> </element> - <element id="UKCore-Request.status"> - <path value="UKCore-Request.status" /> + <element id="NHSDigitalLogicalRequest.status"> + <path value="NHSDigitalLogicalRequest.status" /> <min value="1" /> <max value="1" /> <type> @@ -69,8 +65,8 @@ <profile value="http://hl7.org/fhir/StructureDefinition/code" /> </type> </element> - <element id="UKCore-Request.encounter"> - <path value="UKCore-Request.encounter" /> + <element id="NHSDigitalLogicalRequest.encounter"> + <path value="NHSDigitalLogicalRequest.encounter" /> <short value="Encounter created as part of (recommended)" /> <min value="0" /> <max value="1" /> diff --git a/StructureDefinition/NHSDigital-Medication.StructureDefinition.xml b/StructureDefinition/NHSDigital-Medication.StructureDefinition.xml index 68f0bdcc..9945fc5f 100644 --- a/StructureDefinition/NHSDigital-Medication.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Medication.StructureDefinition.xml @@ -1,9 +1,9 @@ <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="NHSDigital-Medication" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Medication" /> + <version value="2.1.0" /> <name value="NHSDigitalMedication" /> <title value="NHS Digital Medication" /> - <version value="2.1.0" /> <status value="active" /> <date value="2022-08-03" /> <publisher value="NHS Digital" /> diff --git a/StructureDefinition/NHSDigital-MedicationDispense-Message.StructureDefinition.xml b/StructureDefinition/NHSDigital-MedicationDispense-Message.StructureDefinition.xml index e047a1a5..f0837f8a 100644 --- a/StructureDefinition/NHSDigital-MedicationDispense-Message.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-MedicationDispense-Message.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> + <id value="2602d296-e156-4f31-be29-bde622d9deec"/> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationDispense-Message" /> <version value="1.0.1" /> <name value="NHSDigitalMedicationDispenseMessage" /> diff --git a/StructureDefinition/NHSDigital-MedicationRequest-Contained.StructureDefinition.xml b/StructureDefinition/NHSDigital-MedicationRequest-Contained.StructureDefinition.xml index f87c93d8..eb12a7f5 100644 --- a/StructureDefinition/NHSDigital-MedicationRequest-Contained.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-MedicationRequest-Contained.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> + <id value="edf1a62a-259e-49ec-980f-8076f68c7a0a" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-Contained" /> <name value="NHSDigitalMedicationRequestContained" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-MedicationRequest-Message.StructureDefinition.xml b/StructureDefinition/NHSDigital-MedicationRequest-Message.StructureDefinition.xml index 706daa02..081b4fbc 100644 --- a/StructureDefinition/NHSDigital-MedicationRequest-Message.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-MedicationRequest-Message.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="9642a572-0d97-44db-ae50-2566dff42c0a"/> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-Message" /> <name value="NHSDigitalMedicationRequestMessage" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-MedicationRequest.xml b/StructureDefinition/NHSDigital-MedicationRequest.xml index 69ff9ec1..a7f27f63 100644 --- a/StructureDefinition/NHSDigital-MedicationRequest.xml +++ b/StructureDefinition/NHSDigital-MedicationRequest.xml @@ -2,11 +2,11 @@ <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="NHSDigital-MedicationRequest" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest" /> - <version value="1.1.2" /> + <version value="1.2.0" /> <name value="NHSDigitalMedicationRequest" /> <title value="NHS Digital MedicationRequest" /> <status value="draft" /> - <date value="2025-12-15T00:00:00+00:00" /> + <date value="2026-04-07T00:00:00+00:00" /> <publisher value="NHS England" /> <contact> <name value="NHS England" /> @@ -59,12 +59,6 @@ <human value="dispenseRequest.numberOfRepeatsAllowed should be populated for continuous-repeat-dispensing MedicationRequests." /> <expression value="(courseOfTherapyType.coding.code.startsWith('acute') or courseOfTherapyType.coding.code = 'continuous') or (courseOfTherapyType.coding.code.startsWith('continuous-repeat-dispensing') and dispenseRequest.exists() and dispenseRequest.numberOfRepeatsAllowed.exists())" /> </constraint> - <constraint> - <key value="eps-10" /> - <severity value="error" /> - <human value="For continuous-repeat-dispensing (intent=reflex-order) basedOn must be populated" /> - <expression value="(courseOfTherapyType.coding.code = 'acute') or (courseOfTherapyType.coding.code = 'continuous') or (courseOfTherapyType.coding.code = 'continuous-repeat-dispensing' and intent !='reflex-order') or (courseOfTherapyType.coding.code = 'continuous-repeat-dispensing' and intent ='reflex-order' and dispenseRequest.exists() and basedOn.exists())" /> - </constraint> <constraint> <key value="eps-11" /> <severity value="error" /> @@ -383,7 +377,6 @@ <short value="groupIdentifier (Short Form Prescription ID)" /> <definition value="The purpose of the Short Form Prescription ID is to identify the prescription during its lifecycle within the Spine (i.e. prescribe, dispense & claim). The prescription UUID is retained to provide the link through to the Spine medication record within the PSIS and must be included as the first identifier within the prescription message. The format of the Short Form Prescription ID is as follows; `<RandomNumber>-<PracticeODSCode/ClinicODSCode>-<PracticeSequence/ClinicSequence><CheckDigit>` Where; `<RandomNumber>` is a locally generated random number each time a Prescription ID is generated of length 6 hexadecimal characters. `<PracticeODSCode/ClinicODSCode>` is the unique ODS code for the practice or clinic code (aka cost centre) as defined within the Spine SDS of length 6 characters. Where the prescriber ODS code is shorter than 6 characters it must be zero-padded up to six characters from the start of the ODS code, e.g. “0A1B2C”. `<PracticeSequence/ClinicSequence>` is an incremental sequence number starting from 00000 that is reset after FFFFF back to zero of length 5 hexadecimal characters. For systems that support multiple practices or clinics, a sequence number per practice/clinic is required. This is to ensure uniqueness of prescriptions within the Spine EPS component during the prescription lifecycle. `<CheckDigit>` is calculated on the entire ID using the ISO/IEC 7064:2003 MOD 37-2 standard. The check digit algorithm is identical to that using for EPS Release 1. Note. Hyphens are always included to separate the ID into 3 blocks of 6 characters. Note. The implementation of the MOD 37-2 standard uses a “+” character for char 36 opposed to a “*” character. Short Form Prescription ID example (for illustration purposes only); **83C40E-A23856-00123W** ```json "groupIdentifier": { ... "system": "https://fhir.nhs.uk/Id/prescription-order-number", "value": "DC2C66-A1B2C3-23407B" }, ```" /> <comment value="ITK HL7v3 Mapping = The groupIdentifier is equivalent to ParentPrescription.id (prescription-order-number). The extension is used to carry the ParentPrescription.id (UUID)." /> - <min value="1" /> <mustSupport value="true" /> </element> <element id="MedicationRequest.groupIdentifier.extension"> diff --git a/StructureDefinition/NHSDigital-MedicationStatement.StructureDefinition.xml b/StructureDefinition/NHSDigital-MedicationStatement.StructureDefinition.xml index 5807f81f..59226a6b 100644 --- a/StructureDefinition/NHSDigital-MedicationStatement.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-MedicationStatement.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> + <id value="NHSDigital-NHSDigitalMedicationStatement" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationStatement" /> <name value="NHSDigitalMedicationStatement" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-MessageDefinition.StructureDefinition.xml b/StructureDefinition/NHSDigital-MessageDefinition.StructureDefinition.xml index fe054d65..290df1cc 100644 --- a/StructureDefinition/NHSDigital-MessageDefinition.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-MessageDefinition.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="NHSDigital-NHSDigitalMessageDefinition" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageDefinition" /> <name value="NHSDigitalMessageDefinition" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Observation-COVID19.StructureDefinition.xml b/StructureDefinition/NHSDigital-Observation-COVID19.StructureDefinition.xml index 04597cd5..7d454961 100644 --- a/StructureDefinition/NHSDigital-Observation-COVID19.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Observation-COVID19.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="df16016b-7c16-40e7-88d4-bc22b3dcb83f" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-COVID19" /> <name value="NHSDigitalObservationCOVID19" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Organization-SDS.StructureDefinition.xml b/StructureDefinition/NHSDigital-Organization-SDS.StructureDefinition.xml index 618a68c6..611a6ebd 100644 --- a/StructureDefinition/NHSDigital-Organization-SDS.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Organization-SDS.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="821447a8-a400-406b-8e68-dea1f32fadbe" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-SDS" /> <name value="NHSDigitalOrganizationSDS" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Patient-Minimal.StructureDefinition.xml b/StructureDefinition/NHSDigital-Patient-Minimal.StructureDefinition.xml index 70d2315a..e16a7a51 100644 --- a/StructureDefinition/NHSDigital-Patient-Minimal.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Patient-Minimal.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="eb5b4f09-d7f3-4f6c-8da8-e99f5621a7e0" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Minimal" /> <name value="NHSDigitalPatientMinimal" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-PractitionerRole-EPSLegal.xml b/StructureDefinition/NHSDigital-PractitionerRole-EPSLegal.xml index cead0c0b..ee4b49b7 100644 --- a/StructureDefinition/NHSDigital-PractitionerRole-EPSLegal.xml +++ b/StructureDefinition/NHSDigital-PractitionerRole-EPSLegal.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="db6578cd-cc97-4dda-9484-ace683282cb3" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-EPSLegal" /> <name value="NHSDigitalPractitionerRoleEPSLegal" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-PractitionerRole-SDS.StructureDefinition.xml b/StructureDefinition/NHSDigital-PractitionerRole-SDS.StructureDefinition.xml index 06c47183..0946e309 100644 --- a/StructureDefinition/NHSDigital-PractitionerRole-SDS.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-PractitionerRole-SDS.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="7dfce760-2c9b-45a5-bff5-504a3ec9bcf0" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-SDS" /> <name value="NHSDigitalPractitionerRoleSDS" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-PractitionerRole.StructureDefinition.xml b/StructureDefinition/NHSDigital-PractitionerRole.StructureDefinition.xml index 18d4683d..89758e7e 100644 --- a/StructureDefinition/NHSDigital-PractitionerRole.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-PractitionerRole.StructureDefinition.xml @@ -2,8 +2,8 @@ <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="51533f7f-1fa3-4866-a200-01618d377455" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole" /> + <version value="1.0.1" /> <name value="NHSDigitalPractitionerRole" /> - <version value="1.0.1" /> <status value="draft" /> <date value="2024-08-14T13:51:00+00:00" /> <fhirVersion value="4.0.1" /> diff --git a/StructureDefinition/NHSDigital-Questionnaire.StructureDefinition.xml b/StructureDefinition/NHSDigital-Questionnaire.StructureDefinition.xml index 7cbf6c19..f9445265 100644 --- a/StructureDefinition/NHSDigital-Questionnaire.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Questionnaire.StructureDefinition.xml @@ -2,6 +2,7 @@ <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="db6d872f-5bae-49df-908b-73540114c723" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Questionnaire" /> + <version value="0.1.0" /> <name value="NHSDigitalQuestionnaire" /> <status value="draft" /> <fhirVersion value="4.0.1" /> diff --git a/StructureDefinition/NHSDigital-QuestionnaireResponse.StructureDefinition.xml b/StructureDefinition/NHSDigital-QuestionnaireResponse.StructureDefinition.xml index c38c7c72..03f86f51 100644 --- a/StructureDefinition/NHSDigital-QuestionnaireResponse.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-QuestionnaireResponse.StructureDefinition.xml @@ -2,8 +2,8 @@ <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="2b02f97f-e0db-48c9-af27-0fc391677dc4" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-QuestionnaireResponse" /> + <version value="0.1.0" /> <name value="NHSDigitalQuestionnaireResponse" /> - <version value="1.0.1" /> <status value="draft" /> <date value="2024-08-14T13:51:00+00:00" /> <fhirVersion value="4.0.1" /> diff --git a/StructureDefinition/NHSDigital-Range.StructureDefinition.xml b/StructureDefinition/NHSDigital-Range.StructureDefinition.xml index 184d5ff1..08289fad 100644 --- a/StructureDefinition/NHSDigital-Range.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Range.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="d04c8b95-f099-4a5a-9cb3-4e7cd118a29e" /> <url value="https://fhir.nhs.uk.uk/StructureDefinition/NHSDigital-Range" /> <name value="NHSDigitalRange" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-Reference.StructureDefinition.xml b/StructureDefinition/NHSDigital-Reference.StructureDefinition.xml index 84c061ed..5917cf80 100644 --- a/StructureDefinition/NHSDigital-Reference.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Reference.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="f5cbd725-fdde-4fda-8254-29e8efebb75f" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Reference" /> <name value="NHSDigitalReference" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-ServiceRequest-PatientCare.StructureDefinition.xml b/StructureDefinition/NHSDigital-ServiceRequest-PatientCare.StructureDefinition.xml index d94127bb..a9bec0ee 100644 --- a/StructureDefinition/NHSDigital-ServiceRequest-PatientCare.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-ServiceRequest-PatientCare.StructureDefinition.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <StructureDefinition xmlns="http://hl7.org/fhir"> +<id value="b6f026e3-290c-4811-956b-9f728114762a" /> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-PatientCare" /> <name value="NHSDigitalServiceRequestPatientCare" /> <status value="draft" /> diff --git a/StructureDefinition/NHSDigital-ServiceRequest.StructureDefinition.json b/StructureDefinition/NHSDigital-ServiceRequest.StructureDefinition.json index a95143fd..c111cb00 100644 --- a/StructureDefinition/NHSDigital-ServiceRequest.StructureDefinition.json +++ b/StructureDefinition/NHSDigital-ServiceRequest.StructureDefinition.json @@ -1,5 +1,6 @@ { "resourceType": "StructureDefinition", + "id":"a0ba25a0-fb12-40b7-9c62-7fce10f128bf", "url": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest", "name": "NHSDigitalServiceRequest", "status": "draft", diff --git a/StructureDefinition/NHSDigital-Task-Patientcare.StructureDefinition.xml b/StructureDefinition/NHSDigital-Task-Patientcare.StructureDefinition.xml index 95e4069f..1d85ad60 100644 --- a/StructureDefinition/NHSDigital-Task-Patientcare.StructureDefinition.xml +++ b/StructureDefinition/NHSDigital-Task-Patientcare.StructureDefinition.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<id value="fa026fff-f810-4165-b6ad-3ca4af363376" /> <StructureDefinition xmlns="http://hl7.org/fhir"> <url value="https://fhir.nhs.uk/StructureDefinition/NHSDigital-Task-PatientCare" /> <name value="NHSDigitalTaskPatientCare" /> diff --git a/StructureDefinition/NHSEnglandAccount.StructureDefinition.xml b/StructureDefinition/NHSEnglandAccount.StructureDefinition.xml index 013482ed..a2d6fc74 100644 --- a/StructureDefinition/NHSEnglandAccount.StructureDefinition.xml +++ b/StructureDefinition/NHSEnglandAccount.StructureDefinition.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<id value="b64ee556-609b-47be-a615-6bb1a46698d2" /> <StructureDefinition xmlns="http://hl7.org/fhir"> <url value="https://fhir.nhs.uk/StructureDefinition/NHSEngland-Account" /> <name value="NHSEnglandAccount" /> diff --git a/StructureMap/StructureMap-MedicationRepeatInformation-Extension-3to4.json b/StructureMap/StructureMap-MedicationRepeatInformation-Extension-3to4.txt similarity index 99% rename from StructureMap/StructureMap-MedicationRepeatInformation-Extension-3to4.json rename to StructureMap/StructureMap-MedicationRepeatInformation-Extension-3to4.txt index 88d051b5..9987bee8 100644 --- a/StructureMap/StructureMap-MedicationRepeatInformation-Extension-3to4.json +++ b/StructureMap/StructureMap-MedicationRepeatInformation-Extension-3to4.txt @@ -265,4 +265,4 @@ } ] } ] } ] -} +} \ No newline at end of file diff --git a/ValueSet/ValueSet-DM-prescription-type.xml b/ValueSet/ValueSet-DM-prescription-type.xml index b60fe709..2a1709d4 100644 --- a/ValueSet/ValueSet-DM-prescription-type.xml +++ b/ValueSet/ValueSet-DM-prescription-type.xml @@ -22,11 +22,6 @@ <include> <system value="https://fhir.nhs.uk/CodeSystem/prescription-type" /> <version value="1.2.0" /> - <filter> - <property value="deprecated" /> - <op value="exists" /> - <value value="false" /> - </filter> </include> </compose> <expansion> diff --git a/ValueSet/ValueSet-DM-task-business-status.xml b/ValueSet/ValueSet-DM-task-business-status.xml index ff4ed7a4..fdcb63e5 100644 --- a/ValueSet/ValueSet-DM-task-business-status.xml +++ b/ValueSet/ValueSet-DM-task-business-status.xml @@ -2,10 +2,10 @@ <ValueSet xmlns="http://hl7.org/fhir"> <id value="9715939a-920c-48f0-876c-dcf9aff01f8b"/> <url value="https://fhir.nhs.uk/ValueSet/DM-task-business-status"/> - <version value="1.0.0"/> + <version value="1.0.1"/> <name value="EPSTaskBusinessPrescriptionStatus"/> <status value="retired"/> - <date value='2025-04-22' /> + <date value='2026-05-12' /> <publisher value='NHS England' /> <contact> <name value='NHS England' /> @@ -15,10 +15,9 @@ <use value='work' /> <rank value='1' /> </telecom> - </contact -> + </contact> <description - value="A set of codes used to identify the status of a prescription or the status of an item on a prescription. This ValueSet is a subset of [ValueSet-TaskMedicationRequestStatusReason](https://simplifier.net/NHSDigital/3c1b87e6-422d-4ed8-8372-ae3366ab5306/~overview). Hence, it is a duplicate and the need to o retire it." /> + value="A set of codes used to identify the status of a prescription or the status of an item on a prescription. This ValueSet is a subset of [ValueSet-DM Prescription Task Status Reason](https://simplifier.net/NHSDigital/DM-PrescriptionTaskStatusReason/~overview). Hence, it is a duplicate and the need to o retire it." /> <copyright value="Copyright &#169; 2025+ NHS England Licensed under the Apache License, Version 2.0 (the \&quot;License\&quot;); 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 \&quot;AS IS\&quot; 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&#174; FHIR&#174; standard Copyright &#169; 2011+ HL7 The HL7&#174; FHIR&#174; 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> diff --git a/ValueSet/ValueSet-NHSDigital-servicerequest-code.xml b/ValueSet/ValueSet-NHSDigital-servicerequest-code.xml index b8e00ee5..56ad8cac 100644 --- a/ValueSet/ValueSet-NHSDigital-servicerequest-code.xml +++ b/ValueSet/ValueSet-NHSDigital-servicerequest-code.xml @@ -1,4 +1,5 @@ <ValueSet xmlns="http://hl7.org/fhir"> +<id value="8ebd4ece-c4fc-4444-a317-187f9ab86046"/> <url value="https://fhir.nhs.uk/ValueSet/NHSDigital-servicerequest-code" /> <version value="1.0.0" /> <name value="ServiceRequestCode" /> diff --git a/custom.rules.yaml b/custom.rules.yaml new file mode 100644 index 00000000..ee7754d4 --- /dev/null +++ b/custom.rules.yaml @@ -0,0 +1,34 @@ +- action: parse + name: parse-fhir-resources + status: "Checking if all FHIR Resource files can be parsed" + files: + - /**/*.json + - "!package.json" + - "!*.*" + - "!.github/*.*" + - "!documents/*.*" + - "!Diagrams/*.*" + +- name: resource-validation + status: "Validating resources against the FHIR standard and their profiles" + action: validate + category: Resource + suppress: + - 6005 + - eld-16 + - ref-1 + - dom-6 + - 1012 #ref-1 + - 4005 #dom-6 + - CONFIG #errors in dependencies e.g. loops, outdated, pre-release + - 6006 #failure to contact term service + - 1030 #reference loop + - 4009 #missing extensions + +- action: unique + name: unique-canonicals + status: "Checking if all StructureDefinitions have a unique canonical" + category: StructureDefinition + unique: url + +# - include: manifest diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index f149b185..06a46399 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,5 +1,5 @@ { - "updated": "2025-07-25T17:27:50.0661131+01:00", + "updated": "2026-04-07T12:57:28.4297209+01:00", "dependencies": { "hl7.fhir.r4.core": "4.0.1", "fhir.r4.ukcore.stu3.currentbuild": "0.0.3-pre-release"