Dependency and CapabilityStatement target updates

omarisgreat · omarisgreat · commit 6ca4aea48b35 · 2023-09-06T16:48:10.000+01:00
diff --git a/Bundle/Bundle-WGSTestOrderForm-Example.json b/Bundle/Bundle-WGSTestOrderForm-Example.json
@@ -645,9 +645,11 @@
 						"value": "9449307946"
 					}
 				},
-				"request": {
-					"reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-Example"
-				}
+				"request": [
+					{
+						"reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-Example"
+					}
+				]
 			},
       "request": {
         "method": "POST",
diff --git a/CapabilityStatement/CapabilityStatement-genomics-requirements.json b/CapabilityStatement/CapabilityStatement-genomics-requirements.json
@@ -85,55 +85,55 @@
 				},
 				{
 					"type": "ServiceRequest",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-ServiceRequest"
 				},
 				{
 					"type": "PractitionerRole",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-PractitionerRole"
 				},
 				{
 					"type": "Practitioner",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Practitioner"
 				},
 				{
 					"type": "Organization",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Organization"
 				},
 				{
 					"type": "DiagnosticReport",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-DiagnosticReport-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport"
 				},
 				{
 					"type": "FamilyMemberHistory",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-FamilyMemberHistory-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory"
 				},
 				{
 					"type": "Observation",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Observation"
 				},
 				{
 					"type": "Patient",
 					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient"
 				},
 				{
 					"type": "Consent",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Consent"
 				},
 				{
 					"type": "Condition",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Condition"
 				},
 				{
 					"type": "ResearchSubject",
 					"profile": "http://hl7.org/fhir/StructureDefinition/ResearchSubject"
 				},
 				{
 					"type": "RelatedPerson",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-RelatedPerson-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson"
 				},
 				{
 					"type": "Specimen",
-					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics"
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Specimen"
 				},
 				{
 					"type": "Questionnaire",
diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json
@@ -3,6 +3,6 @@
   "dependencies": {
     "fhir.r4.ukcore.stu3.currentbuild": "0.0.6-pre-release",
     "hl7.fhir.r4.core": "4.0.1",
-    "uk.nhsdigital.r4.test": "2.7.9-prerelease"
+    "uk.nhsdigital.r4.test": "2.8.15-prerelease"
   }
 }
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "jurisdiction": "urn:iso:std:iso:3166:-2:GB-ENG",
   "dependencies": {
     "fhir.r4.ukcore.stu3.currentbuild": "0.0.6-pre-release",
-    "uk.nhsdigital.r4.test": "2.7.9-prerelease",
+    "uk.nhsdigital.r4.test": "2.8.15-prerelease",
     "hl7.fhir.r4.core": "4.0.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -85,55 +85,55 @@`
`85`	`85`	`},`
`86`	`86`	`{`
`87`	`87`	`"type": "ServiceRequest",`
`88`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics"`
	`88`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-ServiceRequest"`
`89`	`89`	`},`
`90`	`90`	`{`
`91`	`91`	`"type": "PractitionerRole",`
`92`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"`
	`92`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-PractitionerRole"`
`93`	`93`	`},`
`94`	`94`	`{`
`95`	`95`	`"type": "Practitioner",`
`96`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"`
	`96`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Practitioner"`
`97`	`97`	`},`
`98`	`98`	`{`
`99`	`99`	`"type": "Organization",`
`100`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"`
	`100`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Organization"`
`101`	`101`	`},`
`102`	`102`	`{`
`103`	`103`	`"type": "DiagnosticReport",`
`104`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-DiagnosticReport-Genomics"`
	`104`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport"`
`105`	`105`	`},`
`106`	`106`	`{`
`107`	`107`	`"type": "FamilyMemberHistory",`
`108`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-FamilyMemberHistory-Genomics"`
	`108`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory"`
`109`	`109`	`},`
`110`	`110`	`{`
`111`	`111`	`"type": "Observation",`
`112`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics"`
	`112`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Observation"`
`113`	`113`	`},`
`114`	`114`	`{`
`115`	`115`	`"type": "Patient",`
`116`	`116`	`"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient"`
`117`	`117`	`},`
`118`	`118`	`{`
`119`	`119`	`"type": "Consent",`
`120`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics"`
	`120`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Consent"`
`121`	`121`	`},`
`122`	`122`	`{`
`123`	`123`	`"type": "Condition",`
`124`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition-Genomics"`
	`124`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Condition"`
`125`	`125`	`},`
`126`	`126`	`{`
`127`	`127`	`"type": "ResearchSubject",`
`128`	`128`	`"profile": "http://hl7.org/fhir/StructureDefinition/ResearchSubject"`
`129`	`129`	`},`
`130`	`130`	`{`
`131`	`131`	`"type": "RelatedPerson",`
`132`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-RelatedPerson-Genomics"`
	`132`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson"`
`133`	`133`	`},`
`134`	`134`	`{`
`135`	`135`	`"type": "Specimen",`
`136`		`- "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics"`
	`136`	`+ "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Specimen"`
`137`	`137`	`},`
`138`	`138`	`{`
`139`	`139`	`"type": "Questionnaire",`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"dependencies": {`
`4`	`4`	`"fhir.r4.ukcore.stu3.currentbuild": "0.0.6-pre-release",`
`5`	`5`	`"hl7.fhir.r4.core": "4.0.1",`
`6`		`- "uk.nhsdigital.r4.test": "2.7.9-prerelease"`
	`6`	`+ "uk.nhsdigital.r4.test": "2.8.15-prerelease"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"jurisdiction": "urn:iso:std:iso:3166:-2:GB-ENG",`
`9`	`9`	`"dependencies": {`
`10`	`10`	`"fhir.r4.ukcore.stu3.currentbuild": "0.0.6-pre-release",`
`11`		`- "uk.nhsdigital.r4.test": "2.7.9-prerelease",`
	`11`	`+ "uk.nhsdigital.r4.test": "2.8.15-prerelease",`
`12`	`12`	`"hl7.fhir.r4.core": "4.0.1"`
`13`	`13`	`}`
`14`	`14`	`}`