From 7d14ec070cebfc604d2dc331d7f194077120460a Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 8 May 2025 08:31:13 +0100 Subject: [PATCH 1/7] Update SR.category Update SR.category --- ...e-MichaelJonesRequest-Example_minimal.json | 94 +++--- ...ichaelJonesRequest-Example_v3_message.json | 287 +++++++++--------- ...estOrderForm-CancerSolidTumor-Example.json | 11 - ...quest-MichaelJonesDYPDRequest-Example.json | 42 ++- 4 files changed, 208 insertions(+), 226 deletions(-) diff --git a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json index c5f673c..3261aa0 100644 --- a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json +++ b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json @@ -10,23 +10,23 @@ "entry": [ { "fullUrl": "urn:uuid:a4409d7c-b613-477c-b623-87e60406c2f0", - "resource": { - "resourceType": "MessageHeader", - "id": "a4409d7c-b613-477c-b623-87e60406c2f0", - "eventCoding": { - "system": "https://fhir.nhs.uk/CodeSystem/message-events-genomics", - "code": "genomictestrequest", - "display": "Genomic Test Request" - }, - "source": { - "endpoint": "https://www.christie.nhs.uk/ehr" - }, - "focus": [ - { - "reference": "urn:uuid:66c519dd-423f-4238-89c8-91c5be52f330" - } - ] - } + "resource": { + "resourceType": "MessageHeader", + "id": "a4409d7c-b613-477c-b623-87e60406c2f0", + "eventCoding": { + "system": "https://fhir.nhs.uk/CodeSystem/message-events-genomics", + "code": "genomictestrequest", + "display": "Genomic Test Request" + }, + "source": { + "endpoint": "https://www.christie.nhs.uk/ehr" + }, + "focus": [ + { + "reference": "urn:uuid:66c519dd-423f-4238-89c8-91c5be52f330" + } + ] + } }, { "fullUrl": "urn:uuid:41e4b604-37f3-4799-a6b3-ab5b104f3c97", @@ -37,14 +37,14 @@ { "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-BirthSex", "valueCodeableConcept": { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender", - "code": "M", - "display": "Male" - } - ] - } + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender", + "code": "M", + "display": "Male" + } + ] + } }, { "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-EthnicCategory", @@ -107,7 +107,7 @@ "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-Coverage", "valueCodeableConcept": { "coding": [ - { + { "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-FundingCategory", "code": "nhs-england", "display": "NHS England" @@ -125,44 +125,42 @@ "status": "active", "intent": "order", "category": [ - { + { "coding": [ - { - "system": "http://snomed.info/sct", - "code": "405824009", + { + "system": "http://snomed.info/sct", + "code": "363418001", + "display": "Malignant neoplasm of pancreas (disorder)" + } + ] + }, + { + "coding": [ + { + "system": "http://snomed.info/sct", + "code": "405824009", "display": "Genetic test" } ] } ], "priority": "routine", - "code": { + "code": { "coding": [ - { - "system": "http://snomed.info/sct", - "code": "63491000000109", + { + "system": "http://snomed.info/sct", + "code": "63491000000109", "display": "Paediatric IDH-wildtype glioblastoma tumour and germline WGS (whole genome sequencing)" } ] }, - "subject": { + "subject": { "reference": "urn:uuid:41e4b604-37f3-4799-a6b3-ab5b104f3c97" }, "authoredOn": "2022-07-11T09:00:00Z", "requester": { "reference": "urn:uuid:3462583a-536c-4bad-99d3-44dc553921fd" - }, - "reasonCode": [ - { - "coding": [ - { - "system": "http://snomed.info/sct", - "code": "363418001", - "display": "Malignant neoplasm of pancreas (disorder)" - } - ] - } - ] + } } }, { @@ -190,7 +188,7 @@ }, "display": "NHS Trust - THE CHRISTIE NHS FOUNDATION TRUST" }, - "telecom" : [ + "telecom": [ { "system": "email", "value": "lucy.hale@nhs.net" diff --git a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json index 65f3afb..8c3388c 100644 --- a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json +++ b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json @@ -10,18 +10,18 @@ "entry": [ { "fullUrl": "urn:uuid:a4409d7c-b613-477c-b623-87e60406c2f0", - "resource": { - "resourceType": "MessageHeader", - "id": "a4409d7c-b613-477c-b623-87e60406c2f0", - "eventCoding": { - "system": "https://fhir.nhs.uk/CodeSystem/message-events-genomics", - "code": "genomictestrequest", - "display": "Genomic Test Request" - }, - "destination": [ - { - "name": "National Genomic Medicine Service", - "endpoint": "https://api.service.nhs.uk/GMS", + "resource": { + "resourceType": "MessageHeader", + "id": "a4409d7c-b613-477c-b623-87e60406c2f0", + "eventCoding": { + "system": "https://fhir.nhs.uk/CodeSystem/message-events-genomics", + "code": "genomictestrequest", + "display": "Genomic Test Request" + }, + "destination": [ + { + "name": "National Genomic Medicine Service", + "endpoint": "https://api.service.nhs.uk/GMS", "receiver": { "identifier": { "system": "https://fhir.nhs.uk/Id/ods-organization-code", @@ -29,31 +29,31 @@ }, "display": "Pathology Lab - NORTH WEST GLH LED BY MANCHESTER UNIVERSITY NHS FOUNDATION TRUST" } - } - ], - "sender": { - "reference": "urn:uuid:9af435fd-4bbf-4cc6-81c6-9f2800c2c513", + } + ], + "sender": { + "reference": "urn:uuid:9af435fd-4bbf-4cc6-81c6-9f2800c2c513", "identifier": { "system": "https://fhir.nhs.uk/Id/ods-organization-code", "value": "RBV" }, "display": "NHS Trust - THE CHRISTIE NHS FOUNDATION TRUST" - }, - "source": { - "endpoint": "https://www.christie.nhs.uk/ehr" - }, - "focus": [ - { - "reference": "urn:uuid:66c519dd-423f-4238-89c8-91c5be52f330" - }, - { - "reference": "urn:uuid:840d075e-0480-4134-ae51-27f572731cc8" - }, - { - "reference": "urn:uuid:87486509-5512-44e9-aa95-6d23ae0c8687" - } - ] - } + }, + "source": { + "endpoint": "https://www.christie.nhs.uk/ehr" + }, + "focus": [ + { + "reference": "urn:uuid:66c519dd-423f-4238-89c8-91c5be52f330" + }, + { + "reference": "urn:uuid:840d075e-0480-4134-ae51-27f572731cc8" + }, + { + "reference": "urn:uuid:87486509-5512-44e9-aa95-6d23ae0c8687" + } + ] + } }, { "fullUrl": "urn:uuid:f799ec75-8648-4b91-b0a9-b73b46db2c00", @@ -166,11 +166,11 @@ } ], "type": [ - { + { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/organization-type", - "code": "prov", + { + "system": "http://terminology.hl7.org/CodeSystem/organization-type", + "code": "prov", "display": "Healthcare Provider" } ] @@ -195,12 +195,12 @@ "display": "QWU" }, "contact": [ - { + { "purpose": { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/contactentity-type", - "code": "ADMIN", + { + "system": "http://terminology.hl7.org/CodeSystem/contactentity-type", + "code": "ADMIN", "display": "Administrative" } ] @@ -233,11 +233,11 @@ } ], "type": [ - { + { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/organization-type", - "code": "dept", + { + "system": "http://terminology.hl7.org/CodeSystem/organization-type", + "code": "dept", "display": "Hospital Department" } ] @@ -264,12 +264,12 @@ "display": "R0A" }, "contact": [ - { + { "purpose": { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/contactentity-type", - "code": "ADMIN", + { + "system": "http://terminology.hl7.org/CodeSystem/contactentity-type", + "code": "ADMIN", "display": "Administrative" } ] @@ -306,11 +306,11 @@ } ], "type": [ - { + { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/organization-type", - "code": "prov", + { + "system": "http://terminology.hl7.org/CodeSystem/organization-type", + "code": "prov", "display": "Healthcare Provider" } ] @@ -336,12 +336,12 @@ "display": "QOP" }, "contact": [ - { + { "purpose": { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/contactentity-type", - "code": "ADMIN", + { + "system": "http://terminology.hl7.org/CodeSystem/contactentity-type", + "code": "ADMIN", "display": "Administrative" } ] @@ -371,14 +371,14 @@ { "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-BirthSex", "valueCodeableConcept": { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender", - "code": "M", - "display": "Male" - } - ] - } + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender", + "code": "M", + "display": "Male" + } + ] + } }, { "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-EthnicCategory", @@ -486,8 +486,7 @@ "use": "work" } ], - "address": - { + "address": { "type": "both", "line": [ "48 Astoria Drive" @@ -526,7 +525,7 @@ "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-Coverage", "valueCodeableConcept": { "coding": [ - { + { "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-FundingCategory", "code": "nhs-england", "display": "NHS England" @@ -539,7 +538,7 @@ { "system": "https://www.christie.nhs.uk/ehr", "value": "LabOrder123456", - "assigner": { + "assigner": { "reference": "urn:uuid:9af435fd-4bbf-4cc6-81c6-9f2800c2c513" } } @@ -555,30 +554,39 @@ "status": "active", "intent": "order", "category": [ - { + { "coding": [ - { - "system": "http://snomed.info/sct", - "code": "405824009", + { + "system": "http://snomed.info/sct", + "code": "363418001", + "display": "Malignant neoplasm of pancreas (disorder)" + } + ] + }, + { + "coding": [ + { + "system": "http://snomed.info/sct", + "code": "405824009", "display": "Genetic test" } ] } ], "priority": "routine", - "code": { + "code": { "coding": [ - { - "system": "http://snomed.info/sct", - "code": "63491000000109", + { + "system": "http://snomed.info/sct", + "code": "63491000000109", "display": "Paediatric IDH-wildtype glioblastoma tumour and germline WGS (whole genome sequencing)" } ] }, - "subject": { + "subject": { "reference": "urn:uuid:41e4b604-37f3-4799-a6b3-ab5b104f3c97" }, - "encounter": { + "encounter": { "display": "UKCore-Encounter-OncologyConsultation-Example" }, "authoredOn": "2022-07-11T09:00:00Z", @@ -589,17 +597,6 @@ { "reference": "urn:uuid:309aba59-ce1a-4ee6-bc82-ab44fa1bf904" } - ], - "reasonCode": [ - { - "coding": [ - { - "system": "http://snomed.info/sct", - "code": "363418001", - "display": "Malignant neoplasm of pancreas (disorder)" - } - ] - } ] } }, @@ -620,7 +617,7 @@ "organization": { "reference": "urn:uuid:9af435fd-4bbf-4cc6-81c6-9f2800c2c513" }, - "telecom" : [ + "telecom": [ { "system": "email", "value": "lucy.hale@nhs.net", @@ -650,16 +647,16 @@ "value": "Spec123456" }, "status": "available", - "type": { + "type": { "coding": [ - { - "system": "http://snomed.info/sct", - "code": "87612001", + { + "system": "http://snomed.info/sct", + "code": "87612001", "display": "Blood (substance)" } ] }, - "subject": { + "subject": { "reference": "urn:uuid:41e4b604-37f3-4799-a6b3-ab5b104f3c97" }, "receivedTime": "2022-07-13T09:00:00Z", @@ -674,15 +671,15 @@ }, "collectedDateTime": "2022-07-11T09:00:00Z", "quantity": { - "system": "http://unitsofmeasure.org", - "code": "mL", + "system": "http://unitsofmeasure.org", + "code": "mL", "value": 2.5 }, "method": { "coding": [ { - "system": "http://snomed.info/sct", - "code": "129300006", + "system": "http://snomed.info/sct", + "code": "129300006", "display": "Puncture - action" } ] @@ -690,8 +687,8 @@ "bodySite": { "coding": [ { - "system": "http://snomed.info/sct", - "code": "14975008", + "system": "http://snomed.info/sct", + "code": "14975008", "display": "Forearm structure (body structure)" } ] @@ -705,13 +702,13 @@ "type": { "coding": [ { - "system": "http://terminology.hl7.org/CodeSystem/v2-0203", - "code": "ACSN", + "system": "http://terminology.hl7.org/CodeSystem/v2-0203", + "code": "ACSN", "display": "Accession ID" } ] }, - "system": "https://www.christie.nhs.uk/path", + "system": "https://www.christie.nhs.uk/path", "value": "ASCN123456", "assigner": { "reference": "urn:uuid:9af435fd-4bbf-4cc6-81c6-9f2800c2c513" @@ -721,15 +718,15 @@ "type": { "coding": [ { - "system": "http://snomed.info/sct", - "code": "706067003", + "system": "http://snomed.info/sct", + "code": "706067003", "display": "Blood collection/transfer device (physical object)" } ] }, "specimenQuantity": { - "system": "http://unitsofmeasure.org", - "code": "mL", + "system": "http://unitsofmeasure.org", + "code": "mL", "value": 2.5 } } @@ -738,8 +735,8 @@ { "coding": [ { - "system": "http://terminology.hl7.org/CodeSystem/v2-0493", - "code": "SNR", + "system": "http://terminology.hl7.org/CodeSystem/v2-0493", + "code": "SNR", "display": "Sample not received" } ] @@ -756,33 +753,33 @@ { "system": "https://www.christie.nhs.uk/ehr", "value": "Consent123456", - "assigner": { + "assigner": { "reference": "urn:uuid:9af435fd-4bbf-4cc6-81c6-9f2800c2c513" } } ], "status": "active", - "scope": { + "scope": { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentscope", - "code": "research", + { + "system": "http://terminology.hl7.org/CodeSystem/consentscope", + "code": "research", "display": "Research" } ] }, "category": [ - { + { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentcategorycodes", - "code": "research", + { + "system": "http://terminology.hl7.org/CodeSystem/consentcategorycodes", + "code": "research", "display": "Research Information Access" } ] } ], - "patient": { + "patient": { "reference": "urn:uuid:41e4b604-37f3-4799-a6b3-ab5b104f3c97" }, "dateTime": "2022-07-11T09:00:00Z", @@ -801,7 +798,7 @@ "language": "en-GB", "url": "https://files.genomicsengland.co.uk/forms/Participant-consent-form-for-patients-with-cancer-or-suspected-cancer-C1.pdf", "size": 539588, - "title" : "Participant-consent-form-for-patients-with-cancer-or-suspected-cancer-C1_MJ", + "title": "Participant-consent-form-for-patients-with-cancer-or-suspected-cancer-C1_MJ", "creation": "2022-07-11T09:00:00Z" }, "policy": [ @@ -828,9 +825,9 @@ { "role": { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/extra-security-role-type", - "code": "dataprocessor", + { + "system": "http://terminology.hl7.org/CodeSystem/extra-security-role-type", + "code": "dataprocessor", "display": "data processor" } ] @@ -843,18 +840,18 @@ "action": [ { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentaction", - "code": "access", + { + "system": "http://terminology.hl7.org/CodeSystem/consentaction", + "code": "access", "display": "Access" } ] }, { "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentaction", - "code": "use", + { + "system": "http://terminology.hl7.org/CodeSystem/consentaction", + "code": "use", "display": "Use" } ] @@ -862,37 +859,37 @@ ], "class": [ { - "system": "http://hl7.org/fhir/resource-types", - "code": "DiagnosticReport", + "system": "http://hl7.org/fhir/resource-types", + "code": "DiagnosticReport", "display": "DiagnosticReport" }, { - "system": "http://hl7.org/fhir/resource-types", - "code": "ClinicalImpression", + "system": "http://hl7.org/fhir/resource-types", + "code": "ClinicalImpression", "display": "ClinicalImpression" }, { - "system": "http://hl7.org/fhir/resource-types", - "code": "Condition", - "display": "Condition" + "system": "http://hl7.org/fhir/resource-types", + "code": "Condition", + "display": "Condition" }, { - "system": "http://hl7.org/fhir/resource-types", - "code": "MolecularSequence", - "display": "MolecularSequence" + "system": "http://hl7.org/fhir/resource-types", + "code": "MolecularSequence", + "display": "MolecularSequence" }, { - "system": "http://hl7.org/fhir/resource-types", - "code": "Observation", + "system": "http://hl7.org/fhir/resource-types", + "code": "Observation", "display": "Observation" } ], "code": [ { "coding": [ - { - "system": "https://www.england.nhs.uk/publication/national-genomic-test-directories", - "code": "M219.3", + { + "system": "https://www.england.nhs.uk/publication/national-genomic-test-directories", + "code": "M219.3", "display": "DPYD hotspot" } ] diff --git a/ServiceRequest/ServiceRequest-WGSTestOrderForm-CancerSolidTumor-Example.json b/ServiceRequest/ServiceRequest-WGSTestOrderForm-CancerSolidTumor-Example.json index 90acfed..27771de 100644 --- a/ServiceRequest/ServiceRequest-WGSTestOrderForm-CancerSolidTumor-Example.json +++ b/ServiceRequest/ServiceRequest-WGSTestOrderForm-CancerSolidTumor-Example.json @@ -64,17 +64,6 @@ "requester": { "reference": "PractitionerRole/PractitionerRole-HazelSmithKingstonPathology-Example" }, - "reasonCode": [ - { - "coding": [ - { - "system": "https://fhir.nhs.uk/CodeSystem/reasonfortesting-genomics", - "code": "diagnostic", - "display": "Diagnostic" - } - ] - } - ], "performer": [ { "identifier": { diff --git a/ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json b/ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json index 3f3527d..3602754 100644 --- a/ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json +++ b/ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json @@ -19,7 +19,7 @@ { "system": "https://www.christie.nhs.uk/ehr", "value": "LabOrder123456", - "assigner": { + "assigner": { "identifier": { "system": "https://fhir.nhs.uk/Id/ods-organization-code", "value": "RBV" @@ -38,33 +38,42 @@ "status": "active", "intent": "order", "category": [ - { + { + "coding": [ + { + "system": "http://snomed.info/sct", + "code": "363418001", + "display": "Malignant neoplasm of pancreas (disorder)" + } + ] + }, + { "coding": [ - { - "system": "http://snomed.info/sct", - "code": "405824009", + { + "system": "http://snomed.info/sct", + "code": "405824009", "display": "Genetic test" } ] } ], "priority": "routine", - "code": { + "code": { "coding": [ - { - "system": "http://snomed.info/sct", - "code": "63491000000109", + { + "system": "http://snomed.info/sct", + "code": "63491000000109", "display": "Paediatric IDH-wildtype glioblastoma tumour and germline WGS (whole genome sequencing)" } ] }, - "subject": { + "subject": { "identifier": { "system": "https://fhir.nhs.uk/Id/nhs-number", "value": "9999999999" } }, - "encounter": { + "encounter": { "display": "Encounter/UKCore-Encounter-OncologyConsultation-Example" }, "authoredOn": "2022-07-11T09:00:00Z", @@ -82,17 +91,6 @@ } } ], - "reasonCode": [ - { - "coding": [ - { - "system": "http://snomed.info/sct", - "code": "363418001", - "display": "Malignant neoplasm of pancreas (disorder)" - } - ] - } - ], "specimen": [ { "identifier": { From be3ebf6a197abbbd3daacf665eaf50240d3feed2 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 8 May 2025 09:12:58 +0100 Subject: [PATCH 2/7] Modify Constraints for SR.reasonCode & category Modify Constraints for SR.reasonCode & category --- ...gital-ServiceRequest-Genomics.StructureDefinition.json | 8 +------- fhirpkg.lock.json | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json index 03e1c25..6be9d8d 100644 --- a/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json +++ b/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json @@ -66,10 +66,6 @@ ], "isModifier": false }, - { - "id": "ServiceRequest.extension:priorityReason.value[x]", - "path": "ServiceRequest.extension.value[x]" - }, { "id": "ServiceRequest.extension:priorityReason.value[x].coding", "path": "ServiceRequest.extension.value[x].coding", @@ -145,8 +141,7 @@ { "id": "ServiceRequest.category", "path": "ServiceRequest.category", - "min": 1, - "max": "1" + "min": 1 }, { "id": "ServiceRequest.priority", @@ -314,7 +309,6 @@ { "id": "ServiceRequest.reasonCode", "path": "ServiceRequest.reasonCode", - "min": 1, "binding": { "strength": "preferred", "valueSet": "https://fhir.nhs.uk/ValueSet/genomics-reasonfortesting" diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index 1133e1b..5f2bc66 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,5 +1,5 @@ { - "updated": "2024-05-16T10:18:19.8963748+01:00", + "updated": "2025-05-08T09:07:12.7767319+01:00", "dependencies": { "fhir.r4.ukcore.stu3.currentbuild": "0.0.18-pre-release", "hl7.fhir.r4.core": "4.0.1", @@ -9,5 +9,3 @@ }, "missing": {} } - - From 631252f2a649170d835852b2a67e697427a45c7a Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 8 May 2025 09:55:21 +0100 Subject: [PATCH 3/7] Remove Validation constraints for Bundle message type --- .../MessageDefinition-genomictestrequest.json | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 MessageDefinition/MessageDefinition-genomictestrequest.json diff --git a/MessageDefinition/MessageDefinition-genomictestrequest.json b/MessageDefinition/MessageDefinition-genomictestrequest.json deleted file mode 100644 index d6e73b1..0000000 --- a/MessageDefinition/MessageDefinition-genomictestrequest.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "resourceType": "MessageDefinition", - "id": "genomictestrequest", - "url": "https://fhir.nhs.uk/MessageDefinition/genomic-test-request", - "name": "GenomicTestRequest", - "title": "Genomic Test Request", - "description": "Message Definition for a Genomic ServiceRequest", - "status": "draft", - "date": "2022-11-25", - "version": "0.1.0", - "eventCoding": { - "system": "https://fhir.nhs.uk/CodeSystem/message-events-genomics", - "code": "genomictestrequest" - }, - "focus": [ - { - "code": "ServiceRequest", - "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics", - "min": 1, - "max": "*" - }, - { - "code": "Subscription", - "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Subscription", - "min": 0, - "max": "*" - }, - { - "code": "FamilyMemberHistory", - "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory", - "min": 0, - "max": "*" - }, - { - "code": "Observation", - "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics", - "min": 0, - "max": "*" - }, - { - "code": "Consent", - "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics", - "min": 0, - "max": "1" - }, - { - "code": "QuestionnaireResponse", - "profile": "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", - "min": 0, - "max": "1" - }, - { - "code": "Condition", - "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition-Genomics", - "min": 0, - "max": "*" - }, - { - "code": "RelatedPerson", - "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson", - "min": 0, - "max": "*" - }, - { - "code": "BodyStructure", - "profile": "http://hl7.org/fhir/StructureDefinition/BodyStructure", - "min": 0, - "max": "*" - } - ] -} From 36a488defdb1b49d09364494ba0da4143fba464a Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 8 May 2025 10:29:29 +0100 Subject: [PATCH 4/7] Remove SR Constraints Remove SR Constraints --- ...HSDigital-ServiceRequest-Genomics.StructureDefinition.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json index 6be9d8d..2bd3ba0 100644 --- a/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json +++ b/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json @@ -141,7 +141,8 @@ { "id": "ServiceRequest.category", "path": "ServiceRequest.category", - "min": 1 + "min": 1, + "max": "1" }, { "id": "ServiceRequest.priority", @@ -309,6 +310,7 @@ { "id": "ServiceRequest.reasonCode", "path": "ServiceRequest.reasonCode", + "min": 1, "binding": { "strength": "preferred", "valueSet": "https://fhir.nhs.uk/ValueSet/genomics-reasonfortesting" From 4c128c4cac79ac747ea47b9a801dfef8d8ff7850 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 8 May 2025 10:47:40 +0100 Subject: [PATCH 5/7] Restorre MD-genomictestrequest Restorre MD-genomictestrequest --- .../MessageDefinition-genomictestrequest.json | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 MessageDefinition/MessageDefinition-genomictestrequest.json diff --git a/MessageDefinition/MessageDefinition-genomictestrequest.json b/MessageDefinition/MessageDefinition-genomictestrequest.json new file mode 100644 index 0000000..d6e73b1 --- /dev/null +++ b/MessageDefinition/MessageDefinition-genomictestrequest.json @@ -0,0 +1,71 @@ +{ + "resourceType": "MessageDefinition", + "id": "genomictestrequest", + "url": "https://fhir.nhs.uk/MessageDefinition/genomic-test-request", + "name": "GenomicTestRequest", + "title": "Genomic Test Request", + "description": "Message Definition for a Genomic ServiceRequest", + "status": "draft", + "date": "2022-11-25", + "version": "0.1.0", + "eventCoding": { + "system": "https://fhir.nhs.uk/CodeSystem/message-events-genomics", + "code": "genomictestrequest" + }, + "focus": [ + { + "code": "ServiceRequest", + "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics", + "min": 1, + "max": "*" + }, + { + "code": "Subscription", + "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Subscription", + "min": 0, + "max": "*" + }, + { + "code": "FamilyMemberHistory", + "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory", + "min": 0, + "max": "*" + }, + { + "code": "Observation", + "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics", + "min": 0, + "max": "*" + }, + { + "code": "Consent", + "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics", + "min": 0, + "max": "1" + }, + { + "code": "QuestionnaireResponse", + "profile": "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", + "min": 0, + "max": "1" + }, + { + "code": "Condition", + "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition-Genomics", + "min": 0, + "max": "*" + }, + { + "code": "RelatedPerson", + "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson", + "min": 0, + "max": "*" + }, + { + "code": "BodyStructure", + "profile": "http://hl7.org/fhir/StructureDefinition/BodyStructure", + "min": 0, + "max": "*" + } + ] +} From 065147b873d1844fe1038e5790d1a761c403b68c Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 8 May 2025 10:55:31 +0100 Subject: [PATCH 6/7] Restore SR Constraints Restore SR Constraints --- ...HSDigital-ServiceRequest-Genomics.StructureDefinition.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json index 2bd3ba0..6be9d8d 100644 --- a/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json +++ b/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json @@ -141,8 +141,7 @@ { "id": "ServiceRequest.category", "path": "ServiceRequest.category", - "min": 1, - "max": "1" + "min": 1 }, { "id": "ServiceRequest.priority", @@ -310,7 +309,6 @@ { "id": "ServiceRequest.reasonCode", "path": "ServiceRequest.reasonCode", - "min": 1, "binding": { "strength": "preferred", "valueSet": "https://fhir.nhs.uk/ValueSet/genomics-reasonfortesting" From ed01c9d82ad6e121e4901f33da21cc4f4a27962b Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Mon, 12 May 2025 10:18:30 +0100 Subject: [PATCH 7/7] Remove non-applicable Snomed CT code for ServiceRequest.category Remove non-applicable Snomed CT code for ServiceRequest.category --- ...KCore-Bundle-MichaelJonesRequest-Example_minimal.json | 9 --------- ...re-Bundle-MichaelJonesRequest-Example_v3_message.json | 9 --------- ...e-ServiceRequest-MichaelJonesDYPDRequest-Example.json | 9 --------- 3 files changed, 27 deletions(-) diff --git a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json index 3261aa0..1025f8a 100644 --- a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json +++ b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json @@ -125,15 +125,6 @@ "status": "active", "intent": "order", "category": [ - { - "coding": [ - { - "system": "http://snomed.info/sct", - "code": "363418001", - "display": "Malignant neoplasm of pancreas (disorder)" - } - ] - }, { "coding": [ { diff --git a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json index 8c3388c..f188a16 100644 --- a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json +++ b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json @@ -554,15 +554,6 @@ "status": "active", "intent": "order", "category": [ - { - "coding": [ - { - "system": "http://snomed.info/sct", - "code": "363418001", - "display": "Malignant neoplasm of pancreas (disorder)" - } - ] - }, { "coding": [ { diff --git a/ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json b/ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json index 3602754..cca82b4 100644 --- a/ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json +++ b/ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json @@ -38,15 +38,6 @@ "status": "active", "intent": "order", "category": [ - { - "coding": [ - { - "system": "http://snomed.info/sct", - "code": "363418001", - "display": "Malignant neoplasm of pancreas (disorder)" - } - ] - }, { "coding": [ {