Merge pull request #4 from NHSDigital/Feature-MessageDefinitions

KevinMayfield · web-flow · commit 70aafb28c5c5 · 2022-12-02T11:28:16.000Z
Moving Resource inclusion requirements
diff --git a/MessageDefinition/MessageDefinition-genomictestrequest.json b/MessageDefinition/MessageDefinition-genomictestrequest.json
@@ -19,48 +19,12 @@
             "min": 1,
             "max": "*"
         },
-        {
-            "code": "Patient",
-            "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",
-            "min": 1,
-            "max": "1"
-        },
-        {
-            "code": "Specimen",
-            "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics",
-            "min": 0,
-            "max": "*"
-        },
         {
             "code": "Subscription",
             "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Subscription",
             "min": 0,
             "max": "*"
         },
-        {
-            "code": "PractitionerRole",
-            "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",
-            "min": 1,
-            "max": "*"
-        },
-		{
-            "code": "Practitioner",
-            "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
-            "min": 1,
-            "max": "*"
-        },
-        {
-            "code": "Organization",
-            "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",
-            "min": 1,
-            "max": "*"
-        },
-        {
-            "code": "DiagnosticReport",
-            "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport",
-            "min": 0,
-            "max": "*"
-        },
         {
             "code": "FamilyMemberHistory",
             "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory",
diff --git a/MessageDefinition/MessageDefinition-genomictestresponse.json b/MessageDefinition/MessageDefinition-genomictestresponse.json
@@ -16,24 +16,12 @@
 		{
             "code": "DiagnosticReport",
             "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport",
-            "min": 0,
-            "max": "*"
-        },
-        {
-            "code": "Task",
-            "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Task",
-            "min": 0,
-            "max": "*"
-        },
-		{
-            "code": "Observation",
-            "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics",
-            "min": 0,
+            "min": 1,
             "max": "*"
         },
 		{
-            "code": "PractitionerRole",
-            "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",
+            "code": "Subscription",
+            "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Subscription",
             "min": 0,
             "max": "*"
         }
diff --git a/StructureDefinition/NHSDigital-Condition-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-Condition-Genomics.StructureDefinition.json
@@ -87,6 +87,10 @@
             "targetProfile": [
               "http://hl7.org/fhir/StructureDefinition/Group",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -130,6 +134,10 @@
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -148,6 +156,10 @@
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
diff --git a/StructureDefinition/NHSDigital-Consent-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-Consent-Genomics.StructureDefinition.json
@@ -25,6 +25,10 @@
             "code": "Reference",
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -48,6 +52,10 @@
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -62,6 +70,10 @@
             "code": "Reference",
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -81,6 +93,10 @@
               "http://hl7.org/fhir/StructureDefinition/Contract",
               "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
diff --git a/StructureDefinition/NHSDigital-MessageHeader-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-MessageHeader-Genomics.StructureDefinition.json
@@ -29,6 +29,10 @@
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -43,6 +47,10 @@
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -56,6 +64,10 @@
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -69,6 +81,10 @@
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -83,6 +99,10 @@
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
diff --git a/StructureDefinition/NHSDigital-Observation-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-Observation-Genomics.StructureDefinition.json
@@ -38,14 +38,27 @@
               "http://hl7.org/fhir/StructureDefinition/Device",
               "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Location",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
       },
       {
         "id": "Observation.focus",
         "path": "Observation.focus",
-        "max": "1"
+        "max": "1",
+        "type": [
+          {
+            "code": "Reference",
+            "aggregation": [
+              "referenced",
+              "bundled"
+            ]
+          }
+        ]
       },
       {
         "id": "Observation.encounter",
@@ -85,6 +98,10 @@
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -112,6 +129,10 @@
             "code": "Reference",
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
diff --git a/StructureDefinition/NHSDigital-Organization-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-Organization-Genomics.StructureDefinition.json
@@ -78,6 +78,10 @@
             "code": "Reference",
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
diff --git a/StructureDefinition/NHSDigital-Patient-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-Patient-Genomics.StructureDefinition.json
@@ -159,6 +159,10 @@
             "code": "Reference",
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -191,6 +195,10 @@
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -204,6 +212,10 @@
             "code": "Reference",
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
diff --git a/StructureDefinition/NHSDigital-PractitionerRole-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-PractitionerRole-Genomics.StructureDefinition.json
@@ -36,6 +36,10 @@
             "code": "Reference",
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -49,6 +53,10 @@
             "code": "Reference",
             "targetProfile": [
               "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
+            ],
+            "aggregation": [
+              "referenced",
+              "bundled"
             ]
           }
         ]
@@ -61,7 +69,16 @@
       {
         "id": "PractitionerRole.healthcareService",
         "path": "PractitionerRole.healthcareService",
-        "max": "1"
+        "max": "1",
+        "type": [
+          {
+            "code": "Reference",
+            "aggregation": [
+              "referenced",
+              "bundled"
+            ]
+          }
+        ]
       },
       {
         "id": "PractitionerRole.telecom",
@@ -87,7 +104,16 @@
       {
         "id": "PractitionerRole.endpoint",
         "path": "PractitionerRole.endpoint",
-        "max": "1"
+        "max": "1",
+        "type": [
+          {
+            "code": "Reference",
+            "aggregation": [
+              "referenced",
+              "bundled"
+            ]
+          }
+        ]
       }
     ]
   }
diff --git a/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-ServiceRequest-Genomics.StructureDefinition.json
diff --git a/StructureDefinition/NHSDigital-Specimen-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-Specimen-Genomics.StructureDefinition.json

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,10 @@`
`87`	`87`	`"targetProfile": [`
`88`	`88`	`"http://hl7.org/fhir/StructureDefinition/Group",`
`89`	`89`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"`
	`90`	`+ ],`
	`91`	`+ "aggregation": [`
	`92`	`+ "referenced",`
	`93`	`+ "bundled"`
`90`	`94`	`]`
`91`	`95`	`}`
`92`	`96`	`]`
`@@ -130,6 +134,10 @@`
`130`	`134`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",`
`131`	`135`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",`
`132`	`136`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"`
	`137`	`+ ],`
	`138`	`+ "aggregation": [`
	`139`	`+ "referenced",`
	`140`	`+ "bundled"`
`133`	`141`	`]`
`134`	`142`	`}`
`135`	`143`	`]`
`@@ -148,6 +156,10 @@`
`148`	`156`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",`
`149`	`157`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",`
`150`	`158`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"`
	`159`	`+ ],`
	`160`	`+ "aggregation": [`
	`161`	`+ "referenced",`
	`162`	`+ "bundled"`
`151`	`163`	`]`
`152`	`164`	`}`
`153`	`165`	`]`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@`
`25`	`25`	`"code": "Reference",`
`26`	`26`	`"targetProfile": [`
`27`	`27`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"`
	`28`	`+ ],`
	`29`	`+ "aggregation": [`
	`30`	`+ "referenced",`
	`31`	`+ "bundled"`
`28`	`32`	`]`
`29`	`33`	`}`
`30`	`34`	`]`
`@@ -48,6 +52,10 @@`
`48`	`52`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",`
`49`	`53`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",`
`50`	`54`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"`
	`55`	`+ ],`
	`56`	`+ "aggregation": [`
	`57`	`+ "referenced",`
	`58`	`+ "bundled"`
`51`	`59`	`]`
`52`	`60`	`}`
`53`	`61`	`]`
`@@ -62,6 +70,10 @@`
`62`	`70`	`"code": "Reference",`
`63`	`71`	`"targetProfile": [`
`64`	`72`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"`
	`73`	`+ ],`
	`74`	`+ "aggregation": [`
	`75`	`+ "referenced",`
	`76`	`+ "bundled"`
`65`	`77`	`]`
`66`	`78`	`}`
`67`	`79`	`]`
`@@ -81,6 +93,10 @@`
`81`	`93`	`"http://hl7.org/fhir/StructureDefinition/Contract",`
`82`	`94`	`"http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse",`
`83`	`95`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics"`
	`96`	`+ ],`
	`97`	`+ "aggregation": [`
	`98`	`+ "referenced",`
	`99`	`+ "bundled"`
`84`	`100`	`]`
`85`	`101`	`}`
`86`	`102`	`]`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,10 @@`
`29`	`29`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",`
`30`	`30`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",`
`31`	`31`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"`
	`32`	`+ ],`
	`33`	`+ "aggregation": [`
	`34`	`+ "referenced",`
	`35`	`+ "bundled"`
`32`	`36`	`]`
`33`	`37`	`}`
`34`	`38`	`]`
`@@ -43,6 +47,10 @@`
`43`	`47`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",`
`44`	`48`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",`
`45`	`49`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"`
	`50`	`+ ],`
	`51`	`+ "aggregation": [`
	`52`	`+ "referenced",`
	`53`	`+ "bundled"`
`46`	`54`	`]`
`47`	`55`	`}`
`48`	`56`	`]`
`@@ -56,6 +64,10 @@`
`56`	`64`	`"targetProfile": [`
`57`	`65`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",`
`58`	`66`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"`
	`67`	`+ ],`
	`68`	`+ "aggregation": [`
	`69`	`+ "referenced",`
	`70`	`+ "bundled"`
`59`	`71`	`]`
`60`	`72`	`}`
`61`	`73`	`]`
`@@ -69,6 +81,10 @@`
`69`	`81`	`"targetProfile": [`
`70`	`82`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",`
`71`	`83`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"`
	`84`	`+ ],`
	`85`	`+ "aggregation": [`
	`86`	`+ "referenced",`
	`87`	`+ "bundled"`
`72`	`88`	`]`
`73`	`89`	`}`
`74`	`90`	`]`
`@@ -83,6 +99,10 @@`
`83`	`99`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",`
`84`	`100`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",`
`85`	`101`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"`
	`102`	`+ ],`
	`103`	`+ "aggregation": [`
	`104`	`+ "referenced",`
	`105`	`+ "bundled"`
`86`	`106`	`]`
`87`	`107`	`}`
`88`	`108`	`]`
Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,27 @@`
`38`	`38`	`"http://hl7.org/fhir/StructureDefinition/Device",`
`39`	`39`	`"https://fhir.hl7.org.uk/StructureDefinition/UKCore-Location",`
`40`	`40`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"`
	`41`	`+ ],`
	`42`	`+ "aggregation": [`
	`43`	`+ "referenced",`
	`44`	`+ "bundled"`
`41`	`45`	`]`
`42`	`46`	`}`
`43`	`47`	`]`
`44`	`48`	`},`
`45`	`49`	`{`
`46`	`50`	`"id": "Observation.focus",`
`47`	`51`	`"path": "Observation.focus",`
`48`		`- "max": "1"`
	`52`	`+ "max": "1",`
	`53`	`+ "type": [`
	`54`	`+ {`
	`55`	`+ "code": "Reference",`
	`56`	`+ "aggregation": [`
	`57`	`+ "referenced",`
	`58`	`+ "bundled"`
	`59`	`+ ]`
	`60`	`+ }`
	`61`	`+ ]`
`49`	`62`	`},`
`50`	`63`	`{`
`51`	`64`	`"id": "Observation.encounter",`
`@@ -85,6 +98,10 @@`
`85`	`98`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",`
`86`	`99`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",`
`87`	`100`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"`
	`101`	`+ ],`
	`102`	`+ "aggregation": [`
	`103`	`+ "referenced",`
	`104`	`+ "bundled"`
`88`	`105`	`]`
`89`	`106`	`}`
`90`	`107`	`]`
`@@ -112,6 +129,10 @@`
`112`	`129`	`"code": "Reference",`
`113`	`130`	`"targetProfile": [`
`114`	`131`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics"`
	`132`	`+ ],`
	`133`	`+ "aggregation": [`
	`134`	`+ "referenced",`
	`135`	`+ "bundled"`
`115`	`136`	`]`
`116`	`137`	`}`
`117`	`138`	`]`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@`
`78`	`78`	`"code": "Reference",`
`79`	`79`	`"targetProfile": [`
`80`	`80`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"`
	`81`	`+ ],`
	`82`	`+ "aggregation": [`
	`83`	`+ "referenced",`
	`84`	`+ "bundled"`
`81`	`85`	`]`
`82`	`86`	`}`
`83`	`87`	`]`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,10 @@`
`159`	`159`	`"code": "Reference",`
`160`	`160`	`"targetProfile": [`
`161`	`161`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"`
	`162`	`+ ],`
	`163`	`+ "aggregation": [`
	`164`	`+ "referenced",`
	`165`	`+ "bundled"`
`162`	`166`	`]`
`163`	`167`	`}`
`164`	`168`	`]`
`@@ -191,6 +195,10 @@`
`191`	`195`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",`
`192`	`196`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",`
`193`	`197`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"`
	`198`	`+ ],`
	`199`	`+ "aggregation": [`
	`200`	`+ "referenced",`
	`201`	`+ "bundled"`
`194`	`202`	`]`
`195`	`203`	`}`
`196`	`204`	`]`
`@@ -204,6 +212,10 @@`
`204`	`212`	`"code": "Reference",`
`205`	`213`	`"targetProfile": [`
`206`	`214`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"`
	`215`	`+ ],`
	`216`	`+ "aggregation": [`
	`217`	`+ "referenced",`
	`218`	`+ "bundled"`
`207`	`219`	`]`
`208`	`220`	`}`
`209`	`221`	`]`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@`
`36`	`36`	`"code": "Reference",`
`37`	`37`	`"targetProfile": [`
`38`	`38`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"`
	`39`	`+ ],`
	`40`	`+ "aggregation": [`
	`41`	`+ "referenced",`
	`42`	`+ "bundled"`
`39`	`43`	`]`
`40`	`44`	`}`
`41`	`45`	`]`
`@@ -49,6 +53,10 @@`
`49`	`53`	`"code": "Reference",`
`50`	`54`	`"targetProfile": [`
`51`	`55`	`"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"`
	`56`	`+ ],`
	`57`	`+ "aggregation": [`
	`58`	`+ "referenced",`
	`59`	`+ "bundled"`
`52`	`60`	`]`
`53`	`61`	`}`
`54`	`62`	`]`
`@@ -61,7 +69,16 @@`
`61`	`69`	`{`
`62`	`70`	`"id": "PractitionerRole.healthcareService",`
`63`	`71`	`"path": "PractitionerRole.healthcareService",`
`64`		`- "max": "1"`
	`72`	`+ "max": "1",`
	`73`	`+ "type": [`
	`74`	`+ {`
	`75`	`+ "code": "Reference",`
	`76`	`+ "aggregation": [`
	`77`	`+ "referenced",`
	`78`	`+ "bundled"`
	`79`	`+ ]`
	`80`	`+ }`
	`81`	`+ ]`
`65`	`82`	`},`
`66`	`83`	`{`
`67`	`84`	`"id": "PractitionerRole.telecom",`
`@@ -87,7 +104,16 @@`
`87`	`104`	`{`
`88`	`105`	`"id": "PractitionerRole.endpoint",`
`89`	`106`	`"path": "PractitionerRole.endpoint",`
`90`		`- "max": "1"`
	`107`	`+ "max": "1",`
	`108`	`+ "type": [`
	`109`	`+ {`
	`110`	`+ "code": "Reference",`
	`111`	`+ "aggregation": [`
	`112`	`+ "referenced",`
	`113`	`+ "bundled"`
	`114`	`+ ]`
	`115`	`+ }`
	`116`	`+ ]`
`91`	`117`	`}`
`92`	`118`	`]`
`93`	`119`	`}`