Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions .github/workflows/firely-validation-dotnet.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/firely-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
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: false
JAVA_VALIDATION_ENABLED: true
DOTNET_VALIDATION_ENABLED: true
JAVA_VALIDATION_ENABLED: false
#EXPECTED_FAILS: VALIDATION_EXAMPLES_JAVA
SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }}
SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terminology.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
1 change: 1 addition & 0 deletions ActivityDefinition/DGTS-ActivityDefinition-Example.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
}
],
"title": "15q11 critical region (AS/PWS) - MLPA or equivalent",
"name": "GT1_ActivityDefinition",
"version": "1.0",
"status": "active",
"experimental": false,
Expand Down
2 changes: 1 addition & 1 deletion Bundle/Bundle-NonWGSTestOrderForm-Example.json
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
{
"system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
"code": "inactive",
"display": "inactive"
"display": "Inactive"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion Bundle/Bundle-NonWGSTestOrderForm-Reanalysis-Example.json
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
{
"system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
"code": "inactive",
"display": "inactive"
"display": "Inactive"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion Bundle/Bundle-WGSTestOrderForm-Example.json
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
{
"system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
"code": "inactive",
"display": "inactive"
"display": "Inactive"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion Condition/Condition-InbornErrorOfMetabolism-Example.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
"system": "http://terminology.hl7.org/CodeSystem/condition-ver-status",
"code": "unconfirmed",
"display": "unconfirmed"
"display": "Unconfirmed"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion Condition/Condition-MonogenicHearingLoss-Example.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
"code": "inactive",
"display": "inactive"
"display": "Inactive"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
{
"resourceType": "DiagnosticReport",
"id": "DiagnosticReport-GenomicVariantAssessment-Example",
"meta": {
"profile": [
"http://hl7.org/fhir/uv/genomics-reporting/StructureDefinition/genomic-report",
"https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport",
"http://hl7.eu/fhir/laboratory/StructureDefinition/DiagnosticReport-eu-lab"
]
},
"extension": [
{
"url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.composition",
Expand Down
1 change: 1 addition & 0 deletions Library/DGTS-Library-Example.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Library",
"id": "DGTS-Library-Example",
"url": "https://fhir.nhs.uk/Library/GT1",
"name": "GT1_Library"
"type": {
"coding": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"resourceType": "Observation",
"id": "Observation-GenomicTherapeuticImplication-Example",
"meta": {
"profile": [
"http://hl7.org/fhir/uv/genomics-reporting/StructureDefinition/therapeutic-implication",
"http://hl7.eu/fhir/laboratory/StructureDefinition/Observation-resultslab-eu-lab"
]
},
"status": "final",
"category": [
{
Expand Down
6 changes: 0 additions & 6 deletions Observation/Observation-GenomicsVariantSLC52A2-Example.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"resourceType": "Observation",
"id": "Observation-GenomicsVariantSLC52A2-Example",
"meta": {
"profile": [
"http://hl7.org/fhir/uv/genomics-reporting/StructureDefinition/variant",
"http://hl7.eu/fhir/laboratory/StructureDefinition/Observation-resultslab-eu-lab"
]
},
"status": "final",
"basedOn": [
{
Expand Down
1 change: 1 addition & 0 deletions PlanDefinition/DGTS-PlanDefinition-Example.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
}
],
"title": "Angelman syndrome",
"name": "TP321_PlanDefinition",
"status": "active",
"experimental": false,
"version": "1.0",
Expand Down
9 changes: 6 additions & 3 deletions custom.rules.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# This is the minimal rule series

- action: parse
name: parse-fhir-resources
status: "Checking if all FHIR Resource files can be parsed"
Expand All @@ -20,11 +18,16 @@
- eld-16
- ref-1
- dom-6
- 1012 #ref-1
- 4005 # forgotten
- CONFIG #errors in dependencies e.g. loops, outdated, pre-release
- 6006 #failure to contact term service
- 1030 #reference loop

- action: unique
name: unique-canonicals
status: "Checking if all StructureDefinitions have a unique canonical"
category: StructureDefinition
unique: url

# - include: manifest
# - include: manifest
41 changes: 31 additions & 10 deletions fhirpkg.lock.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,39 @@
{
"updated": "2026-03-26T11:41:42.0351721+00:00",
"updated": "2026-04-15T10:02:40.6338296+01:00",
"dependencies": {
"hl7.fhir.r4.core": "4.0.1",
"hl7.fhir.uv.genomics-reporting": "3.0.0-ballot",
"hl7.fhir.uv.ips": "1.1.0",
"fhir.dicom": "2022.4.20221006",
"hl7.fhir.eu.laboratory": "0.1.0-ballot",
"fhir.r4.ukcore.stu3.currentbuild": "0.28.0-pre-release",
"ihe.iti.pcf": "1.0.0-comment",
"hl7.fhir.r4b.core": "4.3.0",
"us.nlm.vsac": "0.9.0",
"ihe.iti.balp": "1.1.1",
"hl7.fhir.uv.extensions.r4": "5.3.0-ballot-tc1",
"hl7.terminology.r4": "7.1.0"
"hl7.fhir.uv.xver-r5.r4": "0.1.0",
"hl7.terminology.r4": "7.1.0",
"hl7.fhir.uv.genomics-reporting": "3.0.0",
"hl7.fhir.uv.ips": "2.0.0",
"hl7.fhir.uv.ipa": "1.1.0",
"hl7.fhir.eu.laboratory": "0.1.1",
"hl7.fhir.eu.extensions": "0.1.1",
"hl7.terminology.r5": "6.5.0",
"hl7.fhir.uv.extensions.r5": "5.2.0",
"hl7.fhir.r5.core": "5.0.0",
"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.pathology": "0.1.4-alpha",
"fhir.r4.ukcore.stu2": "2.0.2",
"hl7.fhir.eu.extensions.r4": "1.2.0",
"hl7.fhir.eu.base": "2.0.0-ballot",
"ihe.pharm.mpd.r4": "1.0.0-comment-2",
"fhir.r4.nhsengland.programme": "0.23.3-pre-release",
"fhir.tx.support.r4": "0.27.0",
"fhir.r4.nhsengland.stu1": "1.5.0",
"hl7.fhir.uv.tools.r4": "1.1.2"
},
"missing": {}
}
19 changes: 12 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,20 @@
"author": "nhsdigital",
"dependencies": {
"hl7.fhir.r4.core": "4.0.1",
"hl7.fhir.uv.genomics-reporting": "3.0.0-ballot",
"hl7.fhir.uv.ips": "1.1.0",
"hl7.fhir.eu.laboratory": "0.1.0-ballot",
"fhir.r4.ukcore.stu3.currentbuild": "0.28.0-pre-release",
"ihe.iti.pcf": "1.0.0-comment",
"hl7.fhir.uv.extensions.r4": "5.3.0-ballot-tc1"
"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": "0.1.1",
"ihe.iti.pcf": "1.1.0",
"hl7.fhir.us.mcode": "4.0.0",
"fhir.r4.nhsengland.pathology": "0.1.4-alpha",
"fhir.r4.nhsengland.programme": "0.23.3-pre-release",
"hl7.fhir.uv.tools.r4": "1.1.2"
},
"fhirVersions": [
"4.0.1"
],
"jurisdiction": "urn:iso:std:iso:3166:-2:GB-ENG"
}
"jurisdiction": "urn:iso:std:iso:3166:-2#GB"
}