Merge pull request #130 from NHSDigital/Issue-2651

Correction to Specimen reference in Graph

Author: omarisgreat

GraphDefinition/GraphDefinition-Genomics-Test-Order.json

@@ -255,7 +255,15 @@
               ]
             }
           ]
-        },
+        }
+      ]
+    },
+    {
+      "path": "ServiceRequest.specimen",
+      "description": "Optional link to specimen where this has already been collected/ordered prior to request submission",
+      "min": 0,
+      "max": "*",
+      "target": [
         {
           "type": "Specimen",
           "link": [
@@ -309,13 +317,13 @@
       ]
     },
     {
-      "path": "ServiceRequest.specimen",
-      "description": "Optional link to specimen where this has already been collected/ordered prior to request submission",
+      "description": "Specimen resources referencing this ServiceRequest",
       "min": 0,
       "max": "*",
       "target": [
         {
           "type": "Specimen",
+          "params": "request={ref}",
           "link": [
             {
               "path": "Specimen.subject",
@@ -365,17 +373,6 @@
           ]
         }
       ]
-    },
-    {
-      "description": "Specimen resources referencing this ServiceRequest",
-      "min": 0,
-      "max": "*",
-      "target": [
-        {
-          "type": "Specimen",
-          "params": "request={ref}"
-        }
-      ]
     }
   ]
 }