Corrections to definitions

Author: omarisgreat

Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json

@@ -515,6 +515,35 @@
 				}
 			}
 		},
+		{
+			"fullUrl": "urn:uuid:3462583a-536c-4bad-99d3-44dc553921fd",
+			"resource": {
+				"resourceType": "PractitionerRole",
+				"id": "3462583a-536c-4bad-99d3-44dc553921fd",
+				"identifier": {
+					"system": "https://fhir.nhs.uk/Id/sds-role-profile-id",
+					"value": "100102238986"
+				}
+				"practitioner": {
+					"reference": "urn:uuid:6e1a8ea3-3a59-40aa-b943-5c896a30e43a"
+				},
+				"organization": {
+					"reference": "urn:uuid:9af435fd-4bbf-4cc6-81c6-9f2800c2c513"
+				},
+				"telecom" : [
+					{
+						"system": "email",
+						"value": "lucy.hale@nhs.net",
+						"use": "work"
+					},
+					{
+						"system": "phone",
+						"value": "02476151602",
+						"use": "work"
+					}
+				]
+			}
+		},
 		{
 			"fullUrl": "urn:uuid:66c519dd-423f-4238-89c8-91c5be52f330",
 			"resource": {
@@ -567,20 +596,8 @@
 					"display": "UKCore-Encounter-OncologyConsultation-Example"
 				},
 				"authoredOn": "2022-07-11T09:00:00Z",
-				"contained": [
-					{
-						"resourceType": "PractitionerRole",
-						"id": "requester",
-						"practitioner": {
-							"reference": "urn:uuid:6e1a8ea3-3a59-40aa-b943-5c896a30e43a"
-						},
-						"organization": {
-							"reference": "urn:uuid:9af435fd-4bbf-4cc6-81c6-9f2800c2c513"
-						}
-					}
-				],
 				"requester": {
-					"reference": "#requester"
+					"reference": "3462583a-536c-4bad-99d3-44dc553921fd"
 				},
 				"performer": [
 					{

MessageDefinition/MessageDefinition-genomictestrequest.json

@@ -100,7 +100,7 @@
         {
             "code": "RelatedPerson",
             "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson",
-            "min": 1,
+            "min": 0,
             "max": "*"
         }
     ]

StructureDefinition/NHSDigital-MessageDefinition-Genomics.StructureDefinition.json

@@ -7,17 +7,35 @@
   "kind": "resource",
   "abstract": false,
   "type": "MessageDefinition",
-  "baseDefinition": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageDefinition",
+  "baseDefinition": "http://hl7.org/fhir/StructureDefinition/MessageDefinition",
   "derivation": "constraint",
   "differential": {
     "element": [
+	  {
+        "id": "MessageDefinition.url",
+        "path": "MessageDefinition.url",
+		"min": 1,
+		"mustSupport": true
+      },
+	  {
+        "id": "MessageDefinition.description",
+        "path": "MessageDefinition.description",
+		"min": 1,
+		"mustSupport": true
+      },
       {
         "id": "MessageDefinition.event[x]",
         "path": "MessageDefinition.event[x]",
         "binding": {
           "strength": "required",
           "valueSet": "https://fhir.nhs.uk/ValueSet/genomics-message-events"
         }
+      },
+	  {
+        "id": "MessageDefinition.focus",
+        "path": "MessageDefinition.focus",
+		"min": 1,
+		"mustSupport": true
       }
     ]
   }

StructureDefinition/NHSDigital-Specimen-Genomics.StructureDefinition.json

@@ -50,15 +50,14 @@
               "http://hl7.org/fhir/StructureDefinition/Device",
               "http://hl7.org/fhir/StructureDefinition/Substance",
               "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Location",
-              "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"
+              "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"
             ]
           }
         ]
       },
       {
         "id": "Specimen.parent",
         "path": "Specimen.parent",
-        "min": 1,
         "max": "1",
         "type": [
           {