diff --git a/.github/workflows/firely-validation.yml b/.github/workflows/firely-validation.yml index 62b8f94e..bb8cbd9a 100644 --- a/.github/workflows/firely-validation.yml +++ b/.github/workflows/firely-validation.yml @@ -6,10 +6,10 @@ name: Firely Validation on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master, main ] + branches: + - '**' pull_request: - branches: [ master, main ] - + branches: [ master, main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/terminology.yml b/.github/workflows/terminology.yml index b09e0732..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: diff --git a/PlanDefinition/DGTS-PlanDefinition-Example.json b/PlanDefinition/DGTS-PlanDefinition-Example.json index a9393da1..d0ba2209 100644 --- a/PlanDefinition/DGTS-PlanDefinition-Example.json +++ b/PlanDefinition/DGTS-PlanDefinition-Example.json @@ -13,11 +13,76 @@ "use": "old" } ], - "title": "Angelman syndrome", + "version": "1.0", "name": "TP321_PlanDefinition", + "title": "Angelman syndrome", "status": "active", "experimental": false, - "version": "1.0", + "extension": [ + { + "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-PlanDefinition.actor", + "extension": [ + { + "url": "option", + "extension": [ + { + "url": "role", + "valueCodeableConcept": { + "coding": [ + { + "system": "https://fhir.nhs.uk/CodeSystem/action-participant-role-genomics", + "code": "performer", + "display": "Performer" + } + ], + "text": "Performer" + } + }, + { + "url": "typeReference", + "valueReference": { + "reference": "Organization/Organization-CSGLHub-Example", + "identifier": { + "system": "https://fhir.nhs.uk/Id/ods-organization-code", + "value": "699P0" + }, + "display": "Central and South Genomic Laboratory Hub" + } + } + ] + }, + { + "url": "option", + "extension": [ + { + "url": "role", + "valueCodeableConcept": { + "coding": [ + { + "system": "https://fhir.nhs.uk/CodeSystem/action-participant-role-genomics", + "code": "requester", + "display": "Requester" + } + ], + "text": "Requester" + } + }, + { + "url": "typeReference", + "valueReference": { + "reference": "Organization/ImperialCollegeHealthcareNHSTrust-Example", + "identifier": { + "system": "https://fhir.nhs.uk/Id/ods-organization-code", + "value": "RYJ" + }, + "display": "Imperial College Healthcare NHS Trust" + } + } + ] + } + ] + } + ], "useContext": [ { "code": { @@ -119,4 +184,4 @@ "definitionCanonical": "https://fhir.nhs.uk/ActivityDefinition/GT1124" } ] -} +} \ No newline at end of file diff --git a/SearchParameter/SearchParameter-Genomics-plandefinition-actor-role.json b/SearchParameter/SearchParameter-Genomics-plandefinition-actor-role.json new file mode 100644 index 00000000..43ad9239 --- /dev/null +++ b/SearchParameter/SearchParameter-Genomics-plandefinition-actor-role.json @@ -0,0 +1,20 @@ +{ + "resourceType": "SearchParameter", + "id": "SearchParameter-plandefinition-actor-role", + "url": "https://fhir.nhs.uk/SearchParameter/plandefinition-actor-role", + "version": "0.1.0", + "name": "PlanDefinition Actor Role", + "status": "draft", + "experimental": false, + "date": "2026-05-19", + "publisher": "NHS England", + "description": "Search PlanDefinition by actor option role from the R5 cross-version extension extension-PlanDefinition.actor", + "code": "actor-role", + "base": [ + "PlanDefinition" + ], + "type": "token", + "expression": "PlanDefinition.extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-PlanDefinition.actor').extension('option').extension('role').value", + "multipleOr": true, + "multipleAnd": true +} \ No newline at end of file diff --git a/SearchParameter/SearchParameter-Genomics-plandefinition-actor-typereference.json b/SearchParameter/SearchParameter-Genomics-plandefinition-actor-typereference.json new file mode 100644 index 00000000..e577a3b9 --- /dev/null +++ b/SearchParameter/SearchParameter-Genomics-plandefinition-actor-typereference.json @@ -0,0 +1,32 @@ +{ + "resourceType": "SearchParameter", + "id": "SearchParameter-plandefinition-actor-typereference", + "url": "https://fhir.nhs.uk/SearchParameter/plandefinition-actor-typereference", + "version": "0.1.0", + "name": "PlanDefinitionActorTypeReference", + "status": "draft", + "experimental": false, + "date": "2026-05-19", + "publisher": "NHS England", + "description": "Search PlanDefinition by actor option typeReference from the R5 cross-version extension extension-PlanDefinition.actor", + "code": "actor-type-reference", + "base": [ + "PlanDefinition" + ], + "type": "reference", + "expression": "PlanDefinition.extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-PlanDefinition.actor').extension('option').extension('typeReference').value", + "xpathUsage": "normal", + "target": [ + "HealthcareService", + "Group", + "Organization", + "Location", + "Practitioner", + "PractitionerRole", + "Device", + "RelatedPerson", + "Patient" + ], + "multipleOr": true, + "multipleAnd": true +} \ No newline at end of file