Corrections to Structure and MessageDefinitions

Author: omarisgreat

MessageDefinition/MessageDefinition-genomictestrequest.json

@@ -15,7 +15,7 @@
 	"focus":  [
         {
             "code": "MessageHeader",
-            "profile": "https://fhir.nhs.uk/StructureDefinition/UKCore-MessageHeader",
+            "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageHeader-Genomics",
             "min": 1,
             "max": "1"
         },

StructureDefinition/NHSDigital-Patient-Genomics.StructureDefinition.json

@@ -103,31 +103,6 @@
           }
         ]
       },
-      {
-        "id": "Patient.identifier:otherUniqueIdentifier",
-        "path": "Patient.identifier",
-        "sliceName": "otherUniqueIdentifier",
-        "max": "1",
-        "mustSupport": false,
-        "isModifierReason": "nhs number absent"
-      },
-      {
-        "id": "Patient.identifier:otherUniqueIdentifier.value",
-        "path": "Patient.identifier.value",
-        "min": 1
-      },
-      {
-        "id": "Patient.identifier:otherUniqueIdentifier.assigner",
-        "path": "Patient.identifier.assigner",
-        "type": [
-          {
-            "code": "Reference",
-            "targetProfile": [
-              "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
-            ]
-          }
-        ]
-      },
       {
         "id": "Patient.name",
         "path": "Patient.name",

StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json

@@ -18,15 +18,49 @@
         "min": 1,
         "max": "1"
       },
+      {
+        "id": "ServiceRequest.identifier.assigner",
+        "path": "ServiceRequest.identifier.assigner",
+        "type": [
+          {
+            "code": "Reference",
+            "targetProfile": [
+              "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
+            ]
+          }
+        ]
+      },
       {
         "id": "ServiceRequest.instantiatesCanonical",
         "path": "ServiceRequest.instantiatesCanonical",
         "max": "0"
       },
+      {
+        "id": "ServiceRequest.basedOn",
+        "path": "ServiceRequest.basedOn",
+        "type": [
+          {
+            "code": "Reference",
+            "targetProfile": [
+              "https://fhir.hl7.org.uk/StructureDefinition/UKCore-CarePlan",
+              "https://fhir.hl7.org.uk/StructureDefinition/UKCore-MedicationRequest",
+              "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics"
+            ]
+          }
+        ]
+      },
       {
         "id": "ServiceRequest.replaces",
         "path": "ServiceRequest.replaces",
-        "max": "1"
+        "max": "1",
+        "type": [
+          {
+            "code": "Reference",
+            "targetProfile": [
+              "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics"
+            ]
+          }
+        ]
       },
       {
         "id": "ServiceRequest.category",