From 9b282598bce9ef3c4fdb789df323621fb4bef41d Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Tue, 7 Apr 2026 14:34:01 +0100 Subject: [PATCH 01/16] Update StructureDefinition\NHSDigital-MedicationRequest Update StructureDefinition\NHSDigital-MedicationRequest --- ...dicationRequest-WithoutGroupID-Example.xml | 69 +++++++++++++++++++ .../NHSDigital-MedicationRequest.xml | 11 +-- fhirpkg.lock.json | 2 +- 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml diff --git a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml new file mode 100644 index 00000000..454bbfd4 --- /dev/null +++ b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 @@ - + <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/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" From ac4562272178a3b9cbe5df1df4c132337f0fd77b Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 7 Apr 2026 14:45:57 +0100 Subject: [PATCH 02/16] Add Extension-EPS-RepeatInformation Add Extension-EPS-RepeatInformation --- .../MedicationRequest-WithoutGroupID-Example.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml index 454bbfd4..a9fd6466 100644 --- a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml +++ b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml @@ -3,6 +3,14 @@ <extension url="https://fhir.nhs.uk/StructureDefinition/Extension-PendingCancellation"> <valueBoolean value="false" /> </extension> + <extension url="https://fhir.nhs.uk/StructureDefinition/Extension-EPS-RepeatInformation"> + <extension url="numberOfRepeatsAllowed"> + <valueInteger value="5" /> + </extension> + <extension url="numberOfRepeatsIssued"> + <valueInteger value="2" /> + </extension> + </extension> <extension url="https://fhir.nhs.uk/StructureDefinition/Extension-EPS-DispensingInformation"> <extension url="dispenseStatus"> <valueCoding> From c4c368a3e1513343f2e36cb2e0975f7ab240f5ec Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 7 Apr 2026 15:55:48 +0100 Subject: [PATCH 03/16] Update MedicationRequest-WithoutGroupID-Example Update MedicationRequest-WithoutGroupID-Example --- .../MedicationRequest-WithoutGroupID-Example.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml index a9fd6466..799d8346 100644 --- a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml +++ b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml @@ -3,12 +3,13 @@ <extension url="https://fhir.nhs.uk/StructureDefinition/Extension-PendingCancellation"> <valueBoolean value="false" /> </extension> - <extension url="https://fhir.nhs.uk/StructureDefinition/Extension-EPS-RepeatInformation"> - <extension url="numberOfRepeatsAllowed"> - <valueInteger value="5" /> + <extension + url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-MedicationRepeatInformation"> + <extension url="numberOfPrescriptionsIssued"> + <valueUnsignedInt value="3" /> </extension> - <extension url="numberOfRepeatsIssued"> - <valueInteger value="2" /> + <extension url="authorisationExpiryDate"> + <valueDateTime value="2026-12-31" /> </extension> </extension> <extension url="https://fhir.nhs.uk/StructureDefinition/Extension-EPS-DispensingInformation"> From e4ea72185ed990245b53d5d9dc46e0168161a4ee Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 7 Apr 2026 16:07:58 +0100 Subject: [PATCH 04/16] Update MedicationRequest-WithoutGroupID-Example Update MedicationRequest-WithoutGroupID-Example --- MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml index 799d8346..acf7d999 100644 --- a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml +++ b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml @@ -50,7 +50,7 @@ </subject> <courseOfTherapyType> <coding> - <system value="http://terminology.hl7.org/CodeSystem/medicationrequest-course-of-therapy" /> + <system value="https://fhir.nhs.uk/CodeSystem/medicationrequest-course-of-therapy" /> <code value="continuous-repeat-dispensing" /> <display value="Continuous long term (repeat dispensing)" /> </coding> From fba6fc915a01458701d999b67bf828af8af4a4bd Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 7 Apr 2026 16:50:55 +0100 Subject: [PATCH 05/16] Update MedicationRequest-WithoutGroupID-Example Update MedicationRequest-WithoutGroupID-Example --- MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml index acf7d999..22ae9f3a 100644 --- a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml +++ b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml @@ -1,5 +1,5 @@ <MedicationRequest xmlns="http://hl7.org/fhir"> - <id value="MedicationRequest-Prescription-Example" /> + <id value="MedicationRequest-WithoutGroupID-Example" /> <extension url="https://fhir.nhs.uk/StructureDefinition/Extension-PendingCancellation"> <valueBoolean value="false" /> </extension> From 456ff2bda117deb493f84d825deeebf722d7006b Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Wed, 8 Apr 2026 11:56:15 +0100 Subject: [PATCH 06/16] Update MedicationRequest-WithoutGroupID-Example Update MedicationRequest-WithoutGroupID-Example --- .../MedicationRequest-WithoutGroupID-Example.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml index 22ae9f3a..a59348be 100644 --- a/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml +++ b/MedicationRequest/MedicationRequest-WithoutGroupID-Example.xml @@ -26,13 +26,6 @@ <value value="a54219b8-f741-4c47-b662-e4f8dfa49ab6" /> </identifier> <status value="active" /> - <statusReason> - <coding> - <system value="https://fhir.nhs.uk/CodeSystem/medicationrequest-status-reason" /> - <code value="0004" /> - <display value="Clinical grounds" /> - </coding> - </statusReason> <intent value="reflex-order" /> <medicationCodeableConcept> <coding> From f4bf2dae61696fd0ec1357d047931a056764ec5b Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 12 May 2026 17:04:16 +0100 Subject: [PATCH 07/16] Update ValueSet-DM-task-business-status Removing deadlink --- ValueSet/ValueSet-DM-task-business-status.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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> From e183761f040f21c664b79761d7423e2175eebbe2 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 12 May 2026 19:49:16 +0100 Subject: [PATCH 08/16] ConceptMap Issues ConceptMap Issues --- ...nceptMap-bsa-prescription-type-to-mim-organisation-type.json | 1 + ConceptMap/MedicationRequest-course-therapy-type-map.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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..48d6014f 100644 --- a/ConceptMap/MedicationRequest-course-therapy-type-map.xml +++ b/ConceptMap/MedicationRequest-course-therapy-type-map.xml @@ -21,7 +21,7 @@ <sourceUri value="https://fhir.nhs.uk/ValueSet/DM-prescription-therapy-type"/> <group> <source value="http://terminology.hl7.org/CodeSystem/medicationrequest-course-of-therapy"/> - <target value="https://fhir.nhs.uk/CodeSystem/DM-prescription-treatment-type"/> + <target value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PrescriptionType" /> <element> <code value="acute"/> <display value="Short course (acute) therapy"/> From bab641c39ef9ff7f21899d5b957ea1b8c1f545b7 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 12 May 2026 21:26:58 +0100 Subject: [PATCH 09/16] Remove Conflicting NamingSystems --- NamingSystem/prescription-type-ns.xml | 22 -------------------- NamingSystem/ukcore-prescription-type-ns.xml | 22 -------------------- 2 files changed, 44 deletions(-) delete mode 100644 NamingSystem/prescription-type-ns.xml delete mode 100644 NamingSystem/ukcore-prescription-type-ns.xml 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 From 06cc186de1cf3c78def3452fe3ef5e7eea564d27 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Wed, 13 May 2026 20:05:52 +0100 Subject: [PATCH 10/16] Remove filter Remove filter --- ValueSet/ValueSet-DM-prescription-type.xml | 5 ----- 1 file changed, 5 deletions(-) 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> From 700338ec50d2fc5bb152f9594a9f122aed7e67b3 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 18 May 2026 17:49:46 +0100 Subject: [PATCH 11/16] Prescription Status in MedicationRequest Prescription-Status-in-the-Medication-Request --- .github/workflows/firely-validation.yml | 59 +++++++++++++++++++++++++ .github/workflows/terminology.yml | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/firely-validation.yml diff --git a/.github/workflows/firely-validation.yml b/.github/workflows/firely-validation.yml new file mode 100644 index 00000000..62b8f94e --- /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/.github/workflows/terminology.yml b/.github/workflows/terminology.yml index eb43eec7..2b54685a 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: workflow_dispatch: From 3bb6eeb3884e711cfc1956b383633a67776ebd3b Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 18 May 2026 18:10:25 +0100 Subject: [PATCH 12/16] Added Firely Action Added Firely Action --- .github/workflows/firely-validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/firely-validation.yml b/.github/workflows/firely-validation.yml index 62b8f94e..6d144596 100644 --- a/.github/workflows/firely-validation.yml +++ b/.github/workflows/firely-validation.yml @@ -6,9 +6,9 @@ name: Firely Validation on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master, main ] + branches: [ nhsdigital_main] pull_request: - branches: [ master, main ] + branches: [nhsdigital_main] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From ecb5322ab16ec17e31532cab8c262ccde6a26caf Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 18 May 2026 18:52:36 +0100 Subject: [PATCH 13/16] Firely Credentials Issue Firely Credentials Issue --- .github/workflows/firely-validation.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/firely-validation.yml b/.github/workflows/firely-validation.yml index 6d144596..949cf252 100644 --- a/.github/workflows/firely-validation.yml +++ b/.github/workflows/firely-validation.yml @@ -39,6 +39,7 @@ jobs: distribution: 'microsoft' java-version: '21' + - name: Firely.Terminal (GitHub Actions) uses: FirelyTeam/firely-terminal-pipeline@v0.7.31 with: @@ -53,6 +54,17 @@ jobs: FIRELY_TERMINAL_VERSION: 3.5.0 SUSHI_ENABLED: false + - name: Verify Simplifier Access + env: + SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} + SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} + run: | + if [[ -z "$SIMPLIFIER_USERNAME" || -z "$SIMPLIFIER_PASSWORD" ]]; then + echo "ERROR: Simplifier credentials not configured" + exit 1 + fi + echo "Credentials found" + # - name: Add & Commit # uses: EndBug/add-and-commit@v9 # with: From 51815180374f44645163051c198e84b8140dc8e4 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 18 May 2026 19:05:02 +0100 Subject: [PATCH 14/16] Credentials Credentials --- .github/workflows/firely-validation.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/firely-validation.yml b/.github/workflows/firely-validation.yml index 949cf252..1b295b75 100644 --- a/.github/workflows/firely-validation.yml +++ b/.github/workflows/firely-validation.yml @@ -38,7 +38,18 @@ jobs: with: distribution: 'microsoft' java-version: '21' - + + - name: Verify Simplifier Access + env: + SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} + SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} + run: | + if [[ -z "$SIMPLIFIER_USERNAME" || -z "$SIMPLIFIER_PASSWORD" ]]; then + echo "ERROR: Simplifier credentials not configured" + exit 1 + fi + + echo "Credentials found" - name: Firely.Terminal (GitHub Actions) uses: FirelyTeam/firely-terminal-pipeline@v0.7.31 @@ -54,16 +65,7 @@ jobs: FIRELY_TERMINAL_VERSION: 3.5.0 SUSHI_ENABLED: false - - name: Verify Simplifier Access - env: - SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} - SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} - run: | - if [[ -z "$SIMPLIFIER_USERNAME" || -z "$SIMPLIFIER_PASSWORD" ]]; then - echo "ERROR: Simplifier credentials not configured" - exit 1 - fi - echo "Credentials found" + # - name: Add & Commit # uses: EndBug/add-and-commit@v9 From 9ebe577e4c4b2847ed54a44eece7c06ebbe3ed1d Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 18 May 2026 19:09:04 +0100 Subject: [PATCH 15/16] Cred --- .github/workflows/firely-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/firely-validation.yml b/.github/workflows/firely-validation.yml index 1b295b75..9e3efc71 100644 --- a/.github/workflows/firely-validation.yml +++ b/.github/workflows/firely-validation.yml @@ -6,7 +6,7 @@ name: Firely Validation on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ nhsdigital_main] + branches: [nhsdigital_main] pull_request: branches: [nhsdigital_main] From 33b9af1180705ba735fcf7599f668729b91956d6 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 18 May 2026 19:20:15 +0100 Subject: [PATCH 16/16] Bypass --- .github/workflows/firely-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/firely-validation.yml b/.github/workflows/firely-validation.yml index 9e3efc71..18259e17 100644 --- a/.github/workflows/firely-validation.yml +++ b/.github/workflows/firely-validation.yml @@ -56,7 +56,7 @@ jobs: 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 + PATH_TO_QUALITY_CONTROL_RULES: "" DOTNET_VALIDATION_ENABLED: true JAVA_VALIDATION_ENABLED: false #EXPECTED_FAILS: VALIDATION_EXAMPLES_JAVA