FHIR validation fixes and dependency updates

omarisgreat · omarisgreat · commit 258f58518791 · 2023-09-06T15:52:31.000+01:00
diff --git a/Bundle/Bundle-NonWGSTestOrderForm-Example.json b/Bundle/Bundle-NonWGSTestOrderForm-Example.json
@@ -266,7 +266,7 @@
 						"text": "No family history of genomic testing"
 					},
 					{
-						"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient in need of test...example"
+						"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/Patient in need of test...example"
 					}
 				]
 			},
diff --git a/Bundle/Bundle-WGSRoD-Example.json b/Bundle/Bundle-WGSRoD-Example.json
@@ -31,6 +31,14 @@
 				],
 				"sourceReference": {
 					"reference": "QuestionnaireResponse/QuestionnaireResponse-RoD-Example"
+				},
+				"policyRule": {
+					"coding": [
+						{
+							"system": "http://terminology.hl7.org/CodeSystem/consentpolicycodes",
+							"code": "hipaa-research"
+						}
+					]
 				}
 			},
 			"request": {
diff --git a/Bundle/Bundle-WGSTestOrderForm-Example.json b/Bundle/Bundle-WGSTestOrderForm-Example.json
@@ -205,15 +205,15 @@
 					]
 				},
 				"subject": {
-					"reference": "Patient/Patient-LindsaySorrell-Example"
+					"reference": "Patient/Patient-LindsaySorrell-Example",
 					"identifier": {
 						"system": "https://fhir.nhs.uk/Id/nhs-number",
 						"value": "9449307946"
 					}
 				},
 				"authoredOn": "2023-08-08",
 				"requester": {
-					"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example"
+					"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example",
 					"identifier": {
 						"system": "https://fhir.nhs.uk/Id/sds-user-id",
 						"value": "9999999998"
@@ -275,7 +275,7 @@
 						"text": "No family history of genomic testing"
 					},
 					{
-						"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient diagnoses with ADPKD (example)"
+						"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ Patient diagnoses with ADPKD (example)"
 					}
 				]
 			},
@@ -628,7 +628,7 @@
 						"value": "RGT03135"
 					}
 				],
-				"status": "unavailable"
+				"status": "unavailable",
 				"type": {
 					"coding": [
 						{
@@ -646,7 +646,7 @@
 					}
 				},
 				"request": {
-					"reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-Example",
+					"reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-Example"
 				}
 			},
       "request": {
@@ -679,7 +679,15 @@
 							}
 						]
 					}
-				]
+				],
+				"policyRule": {
+					"coding": [
+						{
+							"system": "http://terminology.hl7.org/CodeSystem/consentpolicycodes",
+							"code": "hipaa-research"
+						}
+					]
+				}
 			},
 			"request": {
         "method": "POST",
diff --git a/ServiceRequest/ServiceRequest-SavedTestOrder-Example.json b/ServiceRequest/ServiceRequest-SavedTestOrder-Example.json
@@ -100,7 +100,7 @@
 			"text": "No family history of genomic testing"
 		},
 		{
-			"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient in need of test...example"
+			"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ Patient in need of test...example"
 		}
 	]
 }
diff --git a/ServiceRequest/ServiceRequest-SavedTestOrderUpdated-Example.json b/ServiceRequest/ServiceRequest-SavedTestOrderUpdated-Example.json
@@ -100,7 +100,7 @@
 			"text": "No family history of genomic testing"
 		},
 		{
-			"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient in need of test...example"
+			"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ Patient in need of test...example"
 		}
 	]
 }
diff --git a/ServiceRequest/ServiceRequest-SavedTestOrderWGS-Example.json b/ServiceRequest/ServiceRequest-SavedTestOrderWGS-Example.json
@@ -45,15 +45,15 @@
 		]
 	},
 	"subject": {
-		"reference": "Patient/Patient-LindsaySorrell-Example"
+		"reference": "Patient/Patient-LindsaySorrell-Example",
 		"identifier": {
 			"system": "https://fhir.nhs.uk/Id/nhs-number",
 			"value": "9449307946"
 		}
 	},
 	"authoredOn": "2023-08-08",
 	"requester": {
-		"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example"
+		"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example",
 		"identifier": {
 			"system": "https://fhir.nhs.uk/Id/sds-user-id",
 			"value": "9999999998"
@@ -115,7 +115,7 @@
 			"text": "No family history of genomic testing"
 		},
 		{
-			"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient diagnoses with ADPKD (example)"
+			"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ Patient diagnoses with ADPKD (example)"
 		}
 	]
 }
diff --git a/Task/Task-NonWGSRareDiseaseTestOrderHold-Example.json b/Task/Task-NonWGSRareDiseaseTestOrderHold-Example.json
@@ -10,7 +10,7 @@
 				"display": "Insufficient Sample"
 			}
 		]
-	}
+	},
 	"businessStatus": { 
 		"coding": [
 			{ 
diff --git a/Task/Task-NonWGSRareDiseaseTestOrderRejected-Example.json b/Task/Task-NonWGSRareDiseaseTestOrderRejected-Example.json
@@ -10,7 +10,7 @@
 				"display": "Inappropriate for patient"
 			}
 		]
-	}
+	},
 	"businessStatus": { 
 		"coding": [
 			{ 
diff --git a/Task/Task-WGSRareDiseaseTestOrder-Example.json b/Task/Task-WGSRareDiseaseTestOrder-Example.json
@@ -17,15 +17,15 @@
 		"reference": "ServiceRequest/ServiceRequest-SavedTestOrder-Example"
 	},
 	"for": {
-		"reference": "Patient/Patient-LindsaySorrell-Example"
+		"reference": "Patient/Patient-LindsaySorrell-Example",
 		"identifier": {
 			"system": "https://fhir.nhs.uk/Id/nhs-number",
 			"value": "9449307946"
 		}
 	},
 	"authoredOn": "2022-08-08",
 	"requester": {
-		"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example"
+		"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example",
 		"identifier": {
 			"system": "https://fhir.nhs.uk/Id/sds-user-id",
 			"value": "9999999998"
diff --git a/Task/Task-WGSRareDiseaseTestOrderAccepted-Example.json b/Task/Task-WGSRareDiseaseTestOrderAccepted-Example.json
@@ -26,15 +26,15 @@
 		"reference": "ServiceRequest/ServiceRequest-SavedTestOrder-Example"
 	},
 	"for": {
-		"reference": "Patient/Patient-LindsaySorrell-Example"
+		"reference": "Patient/Patient-LindsaySorrell-Example",
 		"identifier": {
 			"system": "https://fhir.nhs.uk/Id/nhs-number",
 			"value": "9449307946"
 		}
 	},
 	"authoredOn": "2022-08-08",
 	"requester": {
-		"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example"
+		"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example",
 		"identifier": {
 			"system": "https://fhir.nhs.uk/Id/sds-user-id",
 			"value": "9999999998"
diff --git a/Task/Task-WGSRareDiseaseTestOrderForwarded-Example.json b/Task/Task-WGSRareDiseaseTestOrderForwarded-Example.json
@@ -26,15 +26,15 @@
 		"reference": "ServiceRequest/ServiceRequest-SavedTestOrder-Example"
 	},
 	"for": {
-		"reference": "Patient/Patient-LindsaySorrell-Example"
+		"reference": "Patient/Patient-LindsaySorrell-Example",
 		"identifier": {
 			"system": "https://fhir.nhs.uk/Id/nhs-number",
 			"value": "9449307946"
 		}
 	},
 	"authoredOn": "2022-08-08",
 	"requester": {
-		"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example"
+		"reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example",
 		"identifier": {
 			"system": "https://fhir.nhs.uk/Id/sds-user-id",
 			"value": "9999999998"
diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json
@@ -1,7 +1,7 @@
 {
   "updated": "2022-12-19T17:03:24.5930579+00:00",
   "dependencies": {
-    "fhir.r4.ukcore.stu3.currentbuild": "0.0.1-pre-release",
+    "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"
   },
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   ],
   "jurisdiction": "urn:iso:std:iso:3166:-2:GB-ENG",
   "dependencies": {
-    "fhir.r4.ukcore.stu3.currentbuild": "0.0.1-pre-release",
+    "fhir.r4.ukcore.stu3.currentbuild": "0.0.6-pre-release",
     "uk.nhsdigital.r4.test": "2.7.9-prerelease",
     "hl7.fhir.r4.core": "4.0.1"
   }

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@`
`266`	`266`	`"text": "No family history of genomic testing"`
`267`	`267`	`},`
`268`	`268`	`{`
`269`		`- "text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient in need of test...example"`
	`269`	`+ "text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/Patient in need of test...example"`
`270`	`270`	`}`
`271`	`271`	`]`
`272`	`272`	`},`
Original file line number	Diff line number	Diff line change
`@@ -205,15 +205,15 @@`
`205`	`205`	`]`
`206`	`206`	`},`
`207`	`207`	`"subject": {`
`208`		`- "reference": "Patient/Patient-LindsaySorrell-Example"`
	`208`	`+ "reference": "Patient/Patient-LindsaySorrell-Example",`
`209`	`209`	`"identifier": {`
`210`	`210`	`"system": "https://fhir.nhs.uk/Id/nhs-number",`
`211`	`211`	`"value": "9449307946"`
`212`	`212`	`}`
`213`	`213`	`},`
`214`	`214`	`"authoredOn": "2023-08-08",`
`215`	`215`	`"requester": {`
`216`		`- "reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example"`
	`216`	`+ "reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example",`
`217`	`217`	`"identifier": {`
`218`	`218`	`"system": "https://fhir.nhs.uk/Id/sds-user-id",`
`219`	`219`	`"value": "9999999998"`
`@@ -275,7 +275,7 @@`
`275`	`275`	`"text": "No family history of genomic testing"`
`276`	`276`	`},`
`277`	`277`	`{`
`278`		`- "text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient diagnoses with ADPKD (example)"`
	`278`	`+ "text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ Patient diagnoses with ADPKD (example)"`
`279`	`279`	`}`
`280`	`280`	`]`
`281`	`281`	`},`
`@@ -628,7 +628,7 @@`
`628`	`628`	`"value": "RGT03135"`
`629`	`629`	`}`
`630`	`630`	`],`
`631`		`- "status": "unavailable"`
	`631`	`+ "status": "unavailable",`
`632`	`632`	`"type": {`
`633`	`633`	`"coding": [`
`634`	`634`	`{`
`@@ -646,7 +646,7 @@`
`646`	`646`	`}`
`647`	`647`	`},`
`648`	`648`	`"request": {`
`649`		`- "reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-Example",`
	`649`	`+ "reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-Example"`
`650`	`650`	`}`
`651`	`651`	`},`
`652`	`652`	`"request": {`
`@@ -679,7 +679,15 @@`
`679`	`679`	`}`
`680`	`680`	`]`
`681`	`681`	`}`
`682`		`- ]`
	`682`	`+ ],`
	`683`	`+ "policyRule": {`
	`684`	`+ "coding": [`
	`685`	`+ {`
	`686`	`+ "system": "http://terminology.hl7.org/CodeSystem/consentpolicycodes",`
	`687`	`+ "code": "hipaa-research"`
	`688`	`+ }`
	`689`	`+ ]`
	`690`	`+ }`
`683`	`691`	`},`
`684`	`692`	`"request": {`
`685`	`693`	`"method": "POST",`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@`
`100`	`100`	`"text": "No family history of genomic testing"`
`101`	`101`	`},`
`102`	`102`	`{`
`103`		`- "text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient in need of test...example"`
	`103`	`+ "text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ Patient in need of test...example"`
`104`	`104`	`}`
`105`	`105`	`]`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,15 @@`
`45`	`45`	`]`
`46`	`46`	`},`
`47`	`47`	`"subject": {`
`48`		`- "reference": "Patient/Patient-LindsaySorrell-Example"`
	`48`	`+ "reference": "Patient/Patient-LindsaySorrell-Example",`
`49`	`49`	`"identifier": {`
`50`	`50`	`"system": "https://fhir.nhs.uk/Id/nhs-number",`
`51`	`51`	`"value": "9449307946"`
`52`	`52`	`}`
`53`	`53`	`},`
`54`	`54`	`"authoredOn": "2023-08-08",`
`55`	`55`	`"requester": {`
`56`		`- "reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example"`
	`56`	`+ "reference": "PractitionerRole/PractitionerRole-HazelSmithRenal-Example",`
`57`	`57`	`"identifier": {`
`58`	`58`	`"system": "https://fhir.nhs.uk/Id/sds-user-id",`
`59`	`59`	`"value": "9999999998"`
`@@ -115,7 +115,7 @@`
`115`	`115`	`"text": "No family history of genomic testing"`
`116`	`116`	`},`
`117`	`117`	`{`
`118`		`- "text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms<br />Patient diagnoses with ADPKD (example)"`
	`118`	`+ "text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ Patient diagnoses with ADPKD (example)"`
`119`	`119`	`}`
`120`	`120`	`]`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"display": "Insufficient Sample"`
`11`	`11`	`}`
`12`	`12`	`]`
`13`		`- }`
	`13`	`+ },`
`14`	`14`	`"businessStatus": {`
`15`	`15`	`"coding": [`
`16`	`16`	`{`