Merge pull request #110 from NHSDigital/Issue-2605

omarisgreat · web-flow · commit 3717fba46687 · 2024-08-08T14:15:06.000+01:00
Updates to Task inputs and outputs
diff --git a/Provenance/Provenance-WGSTestOrderForm-TrioTestingProbandFather-Example.json b/Provenance/Provenance-WGSTestOrderForm-TrioTestingProbandFather-Example.json
@@ -3,7 +3,7 @@
 	"id": "Provenance-WGSTestOrderForm-TrioTestingProbandFather-Example",
 	"target": [
 		{
-			"reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderFormUpdated-FetalScenario-Example"
+			"reference": "ServiceRequest/ServiceRequest-WGSTestOrderFormUpdated-TrioTesting-Example"
 		}
 	],
 	"recorded": "2023-08-08T15:43:00Z",
@@ -51,7 +51,7 @@
 		{
 			"role": "source",
 			"what": {
-				"reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-FetalScenario-Example"
+				"reference": "ServiceRequest/ServiceRequest-WGSTestOrderFormUpdated-TrioTesting-Example"
 			}
 		}
 	],
diff --git a/ServiceRequest/ServiceRequest-NonWGSTestOrderForm-CascadeTesting-Example.json b/ServiceRequest/ServiceRequest-NonWGSTestOrderForm-CascadeTesting-Example.json
@@ -97,7 +97,7 @@
   ],
   "specimen": [
     {
-      "reference": "Specimen/Specimen-BloodEDTA-WithCollectoinDetails-Example"
+      "reference": "Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example"
     }
   ],
   "note": [
diff --git a/ServiceRequest/ServiceRequest-NonWGSTestOrderForm-UsingStoredSample-Example.json b/ServiceRequest/ServiceRequest-NonWGSTestOrderForm-UsingStoredSample-Example.json
@@ -89,7 +89,7 @@
   ],
   "specimen": [
     {
-      "reference": "Specimen/Specimen-BloodEDTA-WithCollectoinDetails-Example",
+      "reference": "Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example",
       "identifier": [
         {
           "system": "https://fhir.bwc.nhs.uk//Id/specimenId",
diff --git a/Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example.json b/Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "Specimen",
-  "id": "Specimen-BloodEDTA-WithCollectoinDetails-Example",
+  "id": "Specimen-BloodEDTA-WithCollectionDetails-Example",
   "identifier": [
     {
       "system": "https://fhir.leedsth.nhs.uk/Id/specimenId",
diff --git a/Specimen/Specimen-MichaelJonesBloodWithCollectionDetails-Example.json b/Specimen/Specimen-MichaelJonesBloodWithCollectionDetails-Example.json
@@ -1,6 +1,6 @@
 {
 	"resourceType": "Specimen",
-	"id": "Specimen-MichaelJonesBloodWithCollectoinDetails-Example",
+	"id": "Specimen-MichaelJonesBloodWithCollectionDetails-Example",
 	"identifier": [
 		{
 			"system": "https://www.christie.nhs.uk/path",
diff --git a/Task/Task-NonWGSRareDiseaseTestOrderAccepted-SufficientSample-Example.json b/Task/Task-NonWGSRareDiseaseTestOrderAccepted-SufficientSample-Example.json
@@ -17,8 +17,8 @@
         "coding": [
             {
                 "system": "https://fhir.nhs.uk/CodeSystem/task-code-genomics",
-                "code": "process-genomic-test-request",
-                "display": "Process Genomic Test Request"
+                "code": "sample-preparation",
+                "display": "Sample Preparation"
             }
         ]
     },
@@ -64,9 +64,7 @@
                 "system": "https://www.royalmail.com/track-your-item#/",
                 "value": "HZ970705811GB"
             }
-        }
-    ],
-    "output": [
+        },
         {
             "type": {
                 "coding": [
diff --git a/Task/Task-NonWGSRareDiseaseTestOrderCompleted-CascadeTestingExample.json b/Task/Task-NonWGSRareDiseaseTestOrderCompleted-CascadeTestingExample.json
@@ -40,7 +40,7 @@
 			"text": "Optional Free Text field to record any additional details"
 		}
 	],
-	"output": [
+	"input": [
 		{
 			"type": {
 				"coding": [
diff --git a/Task/Task-NonWGSRareDiseaseTestOrderCompleted-FollowupTest-Example.json b/Task/Task-NonWGSRareDiseaseTestOrderCompleted-FollowupTest-Example.json
@@ -40,7 +40,7 @@
             "text": "Optional Free Text field to record any additional details"
         }
     ],
-    "output": [
+    "input": [
         {
             "type": {
                 "coding": [
diff --git a/Task/Task-NonWGSRareDiseaseTestOrderRejected-InsufficientSample-Example.json b/Task/Task-NonWGSRareDiseaseTestOrderRejected-InsufficientSample-Example.json
@@ -17,8 +17,8 @@
         "coding": [
             {
                 "system": "https://fhir.nhs.uk/CodeSystem/task-code-genomics",
-                "code": "request-sample-alignment",
-                "display": "Request & Sample Alignment"
+                "code": "sample-preparation",
+                "display": "Sample Preparation"
             }
         ]
     },
@@ -70,9 +70,7 @@
                     }
                 }
             }
-        }
-    ],
-    "output": [
+        },
         {
             "type": {
                 "coding": [
diff --git a/Task/Task-NonWGSTestOrderFormAccepted-UsingStoredSample-Example.json b/Task/Task-NonWGSTestOrderFormAccepted-UsingStoredSample-Example.json
@@ -8,8 +8,8 @@
         "coding": [
             {
                 "system": "https://fhir.nhs.uk/CodeSystem/task-code-genomics",
-                "code": "process-genomic-test-request",
-                "display": "Process Genomic Test Request"
+                "code": "request-sample-alignment",
+                "display": "Request & Sample Alignment"
             }
         ]
     },
@@ -39,30 +39,7 @@
             "text": "Test critieria met and sample to be used from storage"
         }
     ],
-        "input": [
-            {
-                "type": {
-                    "coding": [
-                        {
-                            "system": "https://fhir.nhs.uk/CodeSystem/AdditionalInfoTypeGenomics",
-                            "code": "WellId",
-                            "display": "Well Identification Number"
-                        }
-                    ]
-                },
-                "valueIdentifier": {
-                    "system": "https://www.guysandstthomas.nhs.uk/WellId",
-                    "value": "RJ1-WID-9449307555",
-                    "assigner": {
-                        "identifier": {
-                            "system": "https://fhir.nhs.uk/Id/ods-organization-code",
-                            "value": "RJ1"
-                        }
-                    }
-                }
-            }
-        ],
-    "output": [
+    "input": [
         {
             "type": {
                 "coding": [
@@ -74,7 +51,7 @@
                 ]
             },
             "valueReference": {
-                "reference": "Specimen/Specimen-BloodEDTA-WithCollectoinDetails-Example"
+                "reference": "Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example"
             }
         }
     ]
diff --git a/Task/Task-NonWGSTestOrderFormRequested-UsingStoredSample-Example.json b/Task/Task-NonWGSTestOrderFormRequested-UsingStoredSample-Example.json
@@ -0,0 +1,79 @@
+{
+    "resourceType": "Task",
+    "id": "Task-NonWGSTestOrderFormRequested-UsingStoredSample-Example",
+    "status": "requested",
+    "intent": "order",
+    "priority": "routine",
+    "code": {
+        "coding": [
+            {
+                "system": "https://fhir.nhs.uk/CodeSystem/task-code-genomics",
+                "code": "sample-preparation",
+                "display": "Sample Preparation"
+            }
+        ]
+    },
+    "focus": {
+        "reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-UsingStoredSample-Example"
+    },
+    "for": {
+        "reference": "Patient/Patient-TimMclullichs-Example",
+        "identifier": {
+            "system": "https://fhir.nhs.uk/Id/nhs-number",
+            "value": "8449303452"
+        }
+    },
+    "authoredOn": "2023-11-02T15:43:00Z",
+    "requester": {
+        "reference": "PractitionerRole/PractitionerRole-OscarShields-Example"
+    },
+    "owner": {
+        "identifier": {
+            "system": "https://fhir.nhs.uk/Id/ods-organization-code",
+            "value": "RQ3"
+        },
+        "display": "BIRMINGHAM WOMEN'S AND CHILDREN'S NHS FOUNDATION TRUST"
+    },
+    "note": [
+        {
+            "text": "Test critieria met and sample to be used from storage"
+        }
+    ],
+    "input": [
+        {
+            "type": {
+                "coding": [
+                    {
+                        "system": "https://fhir.nhs.uk/CodeSystem/AdditionalInfoTypeGenomics",
+                        "code": "Specimen",
+                        "display": "Specimen"
+                    }
+                ]
+            },
+            "valueReference": {
+                "reference": "Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example"
+            }
+        },
+        {
+            "type": {
+                "coding": [
+                    {
+                        "system": "https://fhir.nhs.uk/CodeSystem/AdditionalInfoTypeGenomics",
+                        "code": "WellId",
+                        "display": "Well Identification Number"
+                    }
+                ]
+            },
+            "valueIdentifier": {
+                "system": "https://www.guysandstthomas.nhs.uk/WellId",
+                "value": "RJ1-WID-9449307555",
+                "assigner": {
+                    "identifier": {
+                        "system": "https://fhir.nhs.uk/Id/ods-organization-code",
+                        "value": "RJ1"
+                    }
+                }
+            }
+        }
+    ]
+}
diff --git a/Task/Task-TestOrderFormAccepted-StorageOfMaterial-Example.json b/Task/Task-TestOrderFormAccepted-StorageOfMaterial-Example.json
@@ -40,7 +40,7 @@
             "text": "sample recieved and placed to be placed in storage"
         }
     ],
-    "output": [
+    "input": [
         {
             "type": {
                 "coding": [
@@ -52,7 +52,7 @@
                 ]
             },
             "valueReference": {
-                "reference": "Specimen/Specimen-BloodEDTA-WithCollectoinDetails-Example"
+                "reference": "Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example"
             }
         }
     ]
diff --git a/Task/Task-WGSRareDiseaseTestOrderAccepted-DirectToLab-Example.json b/Task/Task-WGSRareDiseaseTestOrderAccepted-DirectToLab-Example.json
@@ -44,7 +44,7 @@
     },
     "display": "ROYAL DEVON UNIVERSITY HEALTHCARE NHS FOUNDATION TRUST"
   },
-  "output": [
+  "input": [
     {
       "type": {
         "coding": [
diff --git a/Task/Task-WGSRareDiseaseTestOrderAccepted-TrioTestingFather-Example.json b/Task/Task-WGSRareDiseaseTestOrderAccepted-TrioTestingFather-Example.json
@@ -0,0 +1,82 @@
+{
+  "resourceType": "Task",
+  "id": "Task-WGSRareDiseaseTestOrderAccepted-TrioTestingFather-Example",
+  "status": "accepted",
+  "businessStatus": {
+    "coding": [
+      {
+        "system": "https://fhir.nhs.uk/CodeSystem/business-status-genomics",
+        "code": "sample-received",
+        "display": "Sample Received"
+      }
+    ]
+  },
+  "intent": "order",
+  "priority": "routine",
+  "code": {
+    "coding": [
+      {
+        "system": "https://fhir.nhs.uk/CodeSystem/task-code-genomics",
+        "code": "request-sample-alignment",
+        "display": "Request & Sample Alignment"
+      }
+    ]
+  },
+  "focus": {
+    "reference": "ServiceRequest/ServiceRequest-WGSTestOrderFormUpdated-TrioTestingProband-Example"
+  },
+  "for": {
+    "reference": "Patient-PheobeSmithamFather-Example",
+    "identifier": {
+      "system": "https://fhir.nhs.uk/Id/nhs-number",
+      "value": "9449307636"
+    }
+  },
+  "authoredOn": "2023-09-15T15:00:00Z",
+  "lastModified": "2023-09-18T15:00:00Z",
+  "requester": {
+    "reference": "PractitionerRole/PractitionerRole-EugeneSmithLeedsSTH-Example"
+  },
+  "owner": {
+    "identifier": {
+      "system": "https://fhir.nhs.uk/Id/ods-organization-code",
+      "value": "R0A"
+    },
+    "display": "MANCHESTER UNIVERSITY NHS FOUNDATION TRUST"
+  },
+  "note": [
+    {
+      "text": "Optional Free Text field to record any additional details"
+    }
+  ],
+  "input": [
+    {
+      "type": {
+        "coding": [
+          {
+            "system": "https://fhir.nhs.uk/CodeSystem/AdditionalInfoTypeGenomics",
+            "code": "Specimen",
+            "display": "Specimen"
+          }
+        ]
+      },
+      "valueReference": {
+        "reference": "Specimen/Specimen-PheobeSmithamFather-Example"
+      }
+    },
+    {
+      "type": {
+        "coding": [
+          {
+            "system": "https://fhir.nhs.uk/CodeSystem/AdditionalInfoTypeGenomics",
+            "code": "Consent",
+            "display": "Consent"
+          }
+        ]
+      },
+      "valueReference": {
+        "reference": "Consent/Consent-RoD-PheobeSmithamFather-Example"
+      }
+    }
+  ]
+}
diff --git a/Task/Task-WGSRareDiseaseTestOrderAccepted-TrioTestingMother-Example.json b/Task/Task-WGSRareDiseaseTestOrderAccepted-TrioTestingMother-Example.json
diff --git a/Task/Task-WGSRareDiseaseTestOrderAccepted-TrioTestingProband-Example.json b/Task/Task-WGSRareDiseaseTestOrderAccepted-TrioTestingProband-Example.json
diff --git a/Task/Task-WGSRareDiseaseTestOrderCompleted-DirectToLab-Example.json b/Task/Task-WGSRareDiseaseTestOrderCompleted-DirectToLab-Example.json
diff --git a/Task/Task-WGSRareDiseaseTestOrderCompleted-TrioTestingProband-Example.json b/Task/Task-WGSRareDiseaseTestOrderCompleted-TrioTestingProband-Example.json

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"id": "Provenance-WGSTestOrderForm-TrioTestingProbandFather-Example",`
`4`	`4`	`"target": [`
`5`	`5`	`{`
`6`		`- "reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderFormUpdated-FetalScenario-Example"`
	`6`	`+ "reference": "ServiceRequest/ServiceRequest-WGSTestOrderFormUpdated-TrioTesting-Example"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"recorded": "2023-08-08T15:43:00Z",`
`@@ -51,7 +51,7 @@`
`51`	`51`	`{`
`52`	`52`	`"role": "source",`
`53`	`53`	`"what": {`
`54`		`- "reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-FetalScenario-Example"`
	`54`	`+ "reference": "ServiceRequest/ServiceRequest-WGSTestOrderFormUpdated-TrioTesting-Example"`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`],`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@`
`97`	`97`	`],`
`98`	`98`	`"specimen": [`
`99`	`99`	`{`
`100`		`- "reference": "Specimen/Specimen-BloodEDTA-WithCollectoinDetails-Example"`
	`100`	`+ "reference": "Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example"`
`101`	`101`	`}`
`102`	`102`	`],`
`103`	`103`	`"note": [`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`],`
`90`	`90`	`"specimen": [`
`91`	`91`	`{`
`92`		`- "reference": "Specimen/Specimen-BloodEDTA-WithCollectoinDetails-Example",`
	`92`	`+ "reference": "Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example",`
`93`	`93`	`"identifier": [`
`94`	`94`	`{`
`95`	`95`	`"system": "https://fhir.bwc.nhs.uk//Id/specimenId",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"resourceType": "Specimen",`
`3`		`- "id": "Specimen-BloodEDTA-WithCollectoinDetails-Example",`
	`3`	`+ "id": "Specimen-BloodEDTA-WithCollectionDetails-Example",`
`4`	`4`	`"identifier": [`
`5`	`5`	`{`
`6`	`6`	`"system": "https://fhir.leedsth.nhs.uk/Id/specimenId",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"resourceType": "Specimen",`
`3`		`- "id": "Specimen-MichaelJonesBloodWithCollectoinDetails-Example",`
	`3`	`+ "id": "Specimen-MichaelJonesBloodWithCollectionDetails-Example",`
`4`	`4`	`"identifier": [`
`5`	`5`	`{`
`6`	`6`	`"system": "https://www.christie.nhs.uk/path",`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`"coding": [`
`18`	`18`	`{`
`19`	`19`	`"system": "https://fhir.nhs.uk/CodeSystem/task-code-genomics",`
`20`		`- "code": "process-genomic-test-request",`
`21`		`- "display": "Process Genomic Test Request"`
	`20`	`+ "code": "sample-preparation",`
	`21`	`+ "display": "Sample Preparation"`
`22`	`22`	`}`
`23`	`23`	`]`
`24`	`24`	`},`
`@@ -64,9 +64,7 @@`
`64`	`64`	`"system": "https://www.royalmail.com/track-your-item#/",`
`65`	`65`	`"value": "HZ970705811GB"`
`66`	`66`	`}`
`67`		`- }`
`68`		`- ],`
`69`		`- "output": [`
	`67`	`+ },`
`70`	`68`	`{`
`71`	`69`	`"type": {`
`72`	`70`	`"coding": [`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`"text": "Optional Free Text field to record any additional details"`
`41`	`41`	`}`
`42`	`42`	`],`
`43`		`- "output": [`
	`43`	`+ "input": [`
`44`	`44`	`{`
`45`	`45`	`"type": {`
`46`	`46`	`"coding": [`