Updates for FHIR validation

omarisgreat · omarisgreat · commit b808b9bcacd0 · 2023-09-05T16:53:38.000+01:00
Still need CodeSystems and updated dependencies
diff --git a/AuditEvent/AuditEvent-ServiceRequestUpdate-Example.json b/AuditEvent/AuditEvent-ServiceRequestUpdate-Example.json
@@ -31,6 +31,11 @@
 			"requestor": true
 		}
 	],
+	"source": {
+		"observer": {
+			"reference": "PractitionerRole/PractitionerRole-TestClinicalScientist-Example"
+		}
+	},
 	"entity": [
 		{
 			"what": {
diff --git a/AuditEvent/AuditEvent-TaskUpdate-Example.json b/AuditEvent/AuditEvent-TaskUpdate-Example.json
@@ -31,6 +31,11 @@
 			"requestor": true
 		}
 	],
+	"source": {
+		"observer": {
+			"reference": "PractitionerRole/PractitionerRole-TestClinicalScientist-Example"
+		}
+	},
 	"entity": [
 		{
 			"what": {
diff --git a/Bundle/Bundle-NonWGSTestOrderForm-Example.json b/Bundle/Bundle-NonWGSTestOrderForm-Example.json
@@ -236,9 +236,11 @@
 						]
 					}
 				],
-				"reasonReference": {
-					"reference": "Condition/Condition-DiseaseStatus-Example"
-				},
+				"reasonReference": [
+					{
+						"reference": "Condition/Condition-DiseaseStatus-Example"
+					}
+				],
 				"supportingInfo": [
 					{
 						"reference": "Observation/Observation-GenomicEthnicity-Example"
diff --git a/Bundle/Bundle-WGSTestOrderForm-Example.json b/Bundle/Bundle-WGSTestOrderForm-Example.json
@@ -230,9 +230,11 @@
 						]
 					}
 				],
-				"reasonReference": {
-					"reference": "Condition/Condition-DiseaseStatus-Example"
-				},
+				"reasonReference": [
+					{
+						"reference": "Condition/Condition-DiseaseStatus-Example"
+					}
+				],
 				"supportingInfo": [
 					{
 						"reference": "Observation/Observation-GenomicEthnicity-Example"
diff --git a/CapabilityStatement/CapabilityStatement-genomics-requirements.json b/CapabilityStatement/CapabilityStatement-genomics-requirements.json
@@ -1,165 +1,165 @@
 {
-    "resourceType": "CapabilityStatement",
-    "id": "genomics-requirements",
-    "url": "https://fhir.nhs.uk/CapabilityStatement/genomics-requirements",
-    "version": "0.1.0",
-    "name": "GenomicsRequirements",
-    "status": "draft",
-    "date": "2022-11-25T00:00:00+00:00",
-    "publisher": "digital.nhs.uk",
-    "description": "Conformance requirements for NHS Digital Genomics Implementation Guide",
-    "kind": "requirements",
-    "fhirVersion": "4.0.1",
-    "format": [
-        "application/fhir+json",
-        "application/fhir+xml"
-    ],
-    "rest": [
-        {
-            "mode": "server",
-            "security": {
-                "service": [
-                    {
-                        "coding": [
-                            {
-                                "system": "http://terminology.hl7.org/CodeSystem/restful-security-service",
-                                "code": "OAuth",
-                                "display": "OAuth2 Token"
-                            }
-                        ]
-                    }
-                ]
-            },
-            "resource": [
-                {
-                    "type": "Bundle",
-                    "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Bundle"
-                },
-				{
-                    "type": "CodeSystem",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/CodeSystem"
-                },
-				{
-                    "type": "ConceptMap",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/ConceptMap"
-                },
-				{
-                    "type": "HealthcareService",
-                    "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-HealthcareService"
-                },
-				{
-                    "type": "MessageDefinition",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageDefinition-Genomics"
-                },
-				{
-                    "type": "NamingSystem",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/NamingSystem"
-                },
-				{
-                    "type": "Parameters",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/Parameters"
-                },
-				{
-                    "type": "StructureMap",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/StructureMap"
-                },
-				{
-                    "type": "ValueSet",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/ValueSet"
-                },
-                {
-                    "type": "MessageHeader",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageHeader-Genomics"
-                },
-                {
-                    "type": "Subscription",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/Subscription"
-                },
-                {
-                    "type": "CapabilityStatement",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-CapabilityStatement"
-                },
-                {
-                    "type": "Task",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Task-Genomics"
-                },
-                {
-                    "type": "ServiceRequest",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics"
-                },
-                {
-                    "type": "PractitionerRole",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
-                },
-                {
-                    "type": "Practitioner",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"
-                },
-                {
-                    "type": "Organization",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
-                },
-                {
-                    "type": "DiagnosticReport",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-DiagnosticReport-Genomics"
-                },
-                {
-                    "type": "FamilyMemberHistory",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-FamilyMemberHistory-Genomics"
-                },
-                {
-                    "type": "Observation",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics"
-                },
-                {
-                    "type": "Patient",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"
-                },
-                {
-                    "type": "Consent",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics"
-                },
-                {
-                    "type": "Condition",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition-Genomics"
-                },
-                {
-                    "type": "ResearchSubject",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/ResearchSubject"
-                },
-                {
-                    "type": "RelatedPerson",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-RelatedPerson-Genomics"
-                },
-                {
-                    "type": "Specimen",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics"
-                },
-                {
-                    "type": "Questionnaire",
-                    "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Questionnaire"
-                },
-                {
-                    "type": "QuestionnaireResponse",
-                    "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-QuestionnaireResponse"
-                },
-                {
-                    "type": "OperationDefinition",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-OperationDefinition"
-                },
-                {
-                    "type": "OperationOutcome",
-                    "profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-OperationOutcome"
-                },
-                {
-                    "type": "BodyStructure",
-                    "profile": "http://hl7.org/fhir/StructureDefinition/BodyStructure"
-                },
-                {
-                    "type": "Provenance",
-                    "profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Provenance-Genomics"
-                }
-            ]
-        }
-    ]
+	"resourceType": "CapabilityStatement",
+	"id": "genomics-requirements",
+	"url": "https://fhir.nhs.uk/CapabilityStatement/genomics-requirements",
+	"version": "0.1.0",
+	"name": "GenomicsRequirements",
+	"status": "draft",
+	"date": "2022-11-25T00:00:00+00:00",
+	"publisher": "digital.nhs.uk",
+	"description": "Conformance requirements for NHS Digital Genomics Implementation Guide",
+	"kind": "requirements",
+	"fhirVersion": "4.0.1",
+	"format": [
+		"application/fhir+json",
+		"application/fhir+xml"
+	],
+	"rest": [
+		{
+			"mode": "server",
+			"security": {
+				"service": [
+					{
+						"coding": [
+							{
+								"system": "http://terminology.hl7.org/CodeSystem/restful-security-service",
+								"code": "OAuth",
+								"display": "OAuth2 Token"
+							}
+						]
+					}
+				]
+			},
+			"resource": [
+				{
+					"type": "Bundle",
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Bundle"
+				},
+				{
+					"type": "CodeSystem",
+					"profile": "http://hl7.org/fhir/StructureDefinition/CodeSystem"
+				},
+				{
+					"type": "ConceptMap",
+					"profile": "http://hl7.org/fhir/StructureDefinition/ConceptMap"
+				},
+				{
+					"type": "HealthcareService",
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-HealthcareService"
+				},
+				{
+					"type": "MessageDefinition",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageDefinition-Genomics"
+				},
+				{
+					"type": "NamingSystem",
+					"profile": "http://hl7.org/fhir/StructureDefinition/NamingSystem"
+				},
+				{
+					"type": "Parameters",
+					"profile": "http://hl7.org/fhir/StructureDefinition/Parameters"
+				},
+				{
+					"type": "StructureMap",
+					"profile": "http://hl7.org/fhir/StructureDefinition/StructureMap"
+				},
+				{
+					"type": "ValueSet",
+					"profile": "http://hl7.org/fhir/StructureDefinition/ValueSet"
+				},
+				{
+					"type": "MessageHeader",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageHeader-Genomics"
+				},
+				{
+					"type": "Subscription",
+					"profile": "http://hl7.org/fhir/StructureDefinition/Subscription"
+				},
+				{
+					"type": "CapabilityStatement",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-CapabilityStatement"
+				},
+				{
+					"type": "Task",
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Task"
+				},
+				{
+					"type": "ServiceRequest",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics"
+				},
+				{
+					"type": "PractitionerRole",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
+				},
+				{
+					"type": "Practitioner",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"
+				},
+				{
+					"type": "Organization",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
+				},
+				{
+					"type": "DiagnosticReport",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-DiagnosticReport-Genomics"
+				},
+				{
+					"type": "FamilyMemberHistory",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-FamilyMemberHistory-Genomics"
+				},
+				{
+					"type": "Observation",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics"
+				},
+				{
+					"type": "Patient",
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient"
+				},
+				{
+					"type": "Consent",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics"
+				},
+				{
+					"type": "Condition",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition-Genomics"
+				},
+				{
+					"type": "ResearchSubject",
+					"profile": "http://hl7.org/fhir/StructureDefinition/ResearchSubject"
+				},
+				{
+					"type": "RelatedPerson",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-RelatedPerson-Genomics"
+				},
+				{
+					"type": "Specimen",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics"
+				},
+				{
+					"type": "Questionnaire",
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Questionnaire"
+				},
+				{
+					"type": "QuestionnaireResponse",
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-QuestionnaireResponse"
+				},
+				{
+					"type": "OperationDefinition",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-OperationDefinition"
+				},
+				{
+					"type": "OperationOutcome",
+					"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-OperationOutcome"
+				},
+				{
+					"type": "BodyStructure",
+					"profile": "http://hl7.org/fhir/StructureDefinition/BodyStructure"
+				},
+				{
+					"type": "Provenance",
+					"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Provenance-Genomics"
+				}
+			]
+		}
+	]
 }
diff --git a/ServiceRequest/ServiceRequest-SavedTestOrder-Example.json b/ServiceRequest/ServiceRequest-SavedTestOrder-Example.json
@@ -70,9 +70,11 @@
 			]
 		}
 	],
-	"reasonReference": {
-		"reference": "Condition/Condition-DiseaseStatus-Example"
-	},
+	"reasonReference": [
+		{
+			"reference": "Condition/Condition-DiseaseStatus-Example"
+		}
+	],
 	"supportingInfo": [
 		{
 			"reference": "Observation/Observation-GenomicEthnicity-Example"
diff --git a/ServiceRequest/ServiceRequest-SavedTestOrderUpdated-Example.json b/ServiceRequest/ServiceRequest-SavedTestOrderUpdated-Example.json
diff --git a/ServiceRequest/ServiceRequest-SavedTestOrderWGS-Example.json b/ServiceRequest/ServiceRequest-SavedTestOrderWGS-Example.json

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@`
`31`	`31`	`"requestor": true`
`32`	`32`	`}`
`33`	`33`	`],`
	`34`	`+ "source": {`
	`35`	`+ "observer": {`
	`36`	`+ "reference": "PractitionerRole/PractitionerRole-TestClinicalScientist-Example"`
	`37`	`+ }`
	`38`	`+ },`
`34`	`39`	`"entity": [`
`35`	`40`	`{`
`36`	`41`	`"what": {`
Original file line number	Diff line number	Diff line change
`@@ -236,9 +236,11 @@`
`236`	`236`	`]`
`237`	`237`	`}`
`238`	`238`	`],`
`239`		`- "reasonReference": {`
`240`		`- "reference": "Condition/Condition-DiseaseStatus-Example"`
`241`		`- },`
	`239`	`+ "reasonReference": [`
	`240`	`+ {`
	`241`	`+ "reference": "Condition/Condition-DiseaseStatus-Example"`
	`242`	`+ }`
	`243`	`+ ],`
`242`	`244`	`"supportingInfo": [`
`243`	`245`	`{`
`244`	`246`	`"reference": "Observation/Observation-GenomicEthnicity-Example"`
Original file line number	Diff line number	Diff line change
`@@ -230,9 +230,11 @@`
`230`	`230`	`]`
`231`	`231`	`}`
`232`	`232`	`],`
`233`		`- "reasonReference": {`
`234`		`- "reference": "Condition/Condition-DiseaseStatus-Example"`
`235`		`- },`
	`233`	`+ "reasonReference": [`
	`234`	`+ {`
	`235`	`+ "reference": "Condition/Condition-DiseaseStatus-Example"`
	`236`	`+ }`
	`237`	`+ ],`
`236`	`238`	`"supportingInfo": [`
`237`	`239`	`{`
`238`	`240`	`"reference": "Observation/Observation-GenomicEthnicity-Example"`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,11 @@`
`70`	`70`	`]`
`71`	`71`	`}`
`72`	`72`	`],`
`73`		`- "reasonReference": {`
`74`		`- "reference": "Condition/Condition-DiseaseStatus-Example"`
`75`		`- },`
	`73`	`+ "reasonReference": [`
	`74`	`+ {`
	`75`	`+ "reference": "Condition/Condition-DiseaseStatus-Example"`
	`76`	`+ }`
	`77`	`+ ],`
`76`	`78`	`"supportingInfo": [`
`77`	`79`	`{`
`78`	`80`	`"reference": "Observation/Observation-GenomicEthnicity-Example"`