plan_executor 1.0.2 → 1.8.0

data/fixtures/diagnostic_report/dr-200.xml

@@ -31,7 +31,7 @@
       </p>
       <p>
         <b>request</b>: 
-        <a href="DiagnosticOrder/do-200">do-200</a>
+        <a href="DiagnosticRequest/do-200">do-200</a>
       </p>
       <p>
         <b>specimen</b>: 
@@ -91,7 +91,7 @@
     <display value="Gregory F House, PhD"/>
   </performer>
   <request>
-    <reference value="DiagnosticOrder/do-200"/>
+    <reference value="DiagnosticRequest/do-200"/>
     <display value="do-200"/>
   </request>
   <specimen>
@@ -112,9 +112,9 @@
       <display value="Increased blood lead level"/>
     </coding>
   </codedDiagnosis>
-  <!--    finally, here's a pdf representation of the same report.
-    A consuming application could choose to display either the
-	html version above, or the pdf version - they both need to convey the
+  <!--    finally, here's a pdf representation of the same report.
+    A consuming application could choose to display either the
+	html version above, or the pdf version - they both need to convey the
 	same information    -->
   <presentedForm>
     <contentType value="application/pdf"/>

data/fixtures/diagnostic_report/dr-300.xml

@@ -31,7 +31,7 @@
       </p>
       <p>
         <b>request</b>: 
-        <a href="DiagnosticOrder/do-300">DiagnosticOrder/do-300</a>
+        <a href="DiagnosticRequest/do-300">DiagnosticRequest/do-300</a>
       </p>
       <p>
         <b>specimen</b>: 
@@ -102,8 +102,8 @@
     <display value="Acme Labs"/>
   </performer>
   <request>
-    <reference value="DiagnosticOrder/do-300"/>
-    <display value="DiagnosticOrder/do-300"/>
+    <reference value="DiagnosticRequest/do-300"/>
+    <display value="DiagnosticRequest/do-300"/>
   </request>
   <specimen>
     <reference value="Specimen/spec-uslab-example1"/>

data/fixtures/diagnostic_report/dr-400.xml

@@ -31,7 +31,7 @@
       </p>
       <p>
         <b>request</b>: 
-        <a href="DiagnosticOrder/do-400">DiagnosticOrder/do-400</a>
+        <a href="DiagnosticRequest/do-400">DiagnosticRequest/do-400</a>
       </p>
       <p>
         <b>specimen</b>: 
@@ -95,8 +95,8 @@
     <display value="Acme Labs"/>
   </performer>
   <request>
-    <reference value="DiagnosticOrder/do-400"/>
-    <display value="DiagnosticOrder/do-400"/>
+    <reference value="DiagnosticRequest/do-400"/>
+    <display value="DiagnosticRequest/do-400"/>
   </request>
   <specimen>
     <reference value="Specimen/spec-400"/>

data/fixtures/{diagnostic_order → diagnostic_request}/do-100.xml

@@ -1,64 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DiagnosticOrder xmlns="http://hl7.org/fhir">
-  <id value="do-100"/>
-  <text>
-    <status value="generated"/>
-    <div xmlns="http://www.w3.org/1999/xhtml">
-      <p>
-        <b>Generated Narrative with Details</b>
-      </p>
-      <p>
-        <b>id</b>: do-100</p>
-      <p>
-        <b>subject</b>: 
-        <a href="Patient/patient-uslab-example1">Todd G. Lerr</a>
-      </p>
-      <p>
-        <b>orderer</b>: 
-        <a href="Practitioner/pract-uslab-example1">Leonard T Bloodraw</a>
-      </p>
-      <p>
-        <b>identifier</b>: PLAC = plac-id-100</p>
-      <p>
-        <b>reason</b>: I48.2 
-        <span style="background: LightGoldenRodYellow ">(Details : {http://hl7.org/fhir/sid/icd-10-us code "I48.2" := "I48.2)</span>
-      </p>
-      <p>
-        <b>status</b>: requested</p>
-    </div>
-  </text>
-  <subject>
-    <reference value="Patient/patient-uslab-example1"/>
-    <display value="Todd G. Lerr"/>
-  </subject>
-  <orderer>
-    <reference value="Practitioner/pract-uslab-example1"/>
-    <display value="Leonard T Bloodraw"/>
-  </orderer>
-  <identifier>
-    <type>
-      <coding>
-        <code value="http://hl7.org/fhir/identifier-type"/>
-        <display value="PLAC"/>
-      </coding>
-    </type>
-    <system value="http://goodhealth.org/identifiers"/>
-    <value value="do-100"/>
-  </identifier>
-  <reason>
-    <coding>
-      <system value="http://hl7.org/fhir/sid/icd-10-us"/>
-      <code value="I48.2"/>
-    </coding>
-  </reason>
-  <status value="requested"/>
-  <item>
-    <code>
-      <coding>
-        <system value="http://lis.acmelabs.org/codes"/>
-        <code value="100"/>
-      </coding>
-    </code>
-    <status value="requested"/>
-  </item>
-</DiagnosticOrder>
+<?xml version="1.0" encoding="UTF-8"?>
+<DiagnosticRequest xmlns="http://hl7.org/fhir">
+  <id value="do-100"/>
+  <text>
+    <status value="generated"/>
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <p>
+        <b>Generated Narrative with Details</b>
+      </p>
+      <p>
+        <b>id</b>: do-100</p>
+      <p>
+        <b>subject</b>:
+        <a href="Patient/patient-uslab-example1">Todd G. Lerr</a>
+      </p>
+      <p>
+        <b>orderer</b>:
+        <a href="Practitioner/pract-uslab-example1">Leonard T Bloodraw</a>
+      </p>
+      <p>
+        <b>identifier</b>: PLAC = plac-id-100</p>
+      <p>
+        <b>reason</b>: I48.2
+        <span style="background: LightGoldenRodYellow ">(Details : {http://hl7.org/fhir/sid/icd-10-us code "I48.2" := "I48.2)</span>
+      </p>
+      <p>
+        <b>status</b>: active</p>
+    </div>
+  </text>
+  <identifier>
+    <type>
+      <coding>
+        <code value="http://hl7.org/fhir/identifier-type"/>
+        <display value="PLAC"/>
+      </coding>
+    </type>
+    <system value="http://goodhealth.org/identifiers"/>
+    <value value="do-100"/>
+  </identifier>
+  <status value="active"/>
+  <intent value="original-order"/>
+  <code>
+    <coding>
+      <system value="http://lis.acmelabs.org/codes"/>
+      <code value="100"/>
+    </coding>
+  </code>
+  <subject>
+    <reference value="Patient/example"/>
+  </subject>
+  <reasonCode>
+    <coding>
+      <system value="http://hl7.org/fhir/sid/icd-10-us"/>
+      <code value="I48.2"/>
+    </coding>
+  </reasonCode>
+</DiagnosticRequest>

data/fixtures/diagnostic_request/do-200.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DiagnosticRequest xmlns="http://hl7.org/fhir">
+  <id value="do-200"/>
+  <text>
+    <status value="generated"/>
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <p>
+        <b>Generated Narrative with Details</b>
+      </p>
+      <p>
+        <b>id</b>: do-200</p>
+      <p>
+        <b>subject</b>:
+        <a href="Patient/patient-uslab-example1">Todd Lerr</a>
+      </p>
+      <p>
+        <b>orderer</b>:
+        <a href="Practitioner/pract-uslab-example1">Dr Leonard T Bloodraw Jr</a>
+      </p>
+      <p>
+        <b>identifier</b>: PLAC = do-200</p>
+      <p>
+        <b>reason</b>: Abnormal lead level in blood
+        <span style="background: LightGoldenRodYellow ">(Details : {http://www.icd10data.com/icd10pcs code "R78.71" := "R78.71", given as "Abnormal lead level in blood"})</span>
+      </p>
+      <p>
+        <b>supportingInformation</b>: ,
+        <a href="Condition/cond-uslab-example1">Lead Exposure</a>
+      </p>
+      <p>
+        <b>status</b>: active</p>
+      <p>
+        <b>priority</b>: routine</p>
+      <p>
+        <b>note</b>: Annontation: patient is afraid of needles</p>
+    </div>
+  </text>
+  <identifier>
+    <type>
+      <coding>
+        <code value="http://hl7.org/fhir/identifier-type"/>
+        <display value="PLAC"/>
+      </coding>
+    </type>
+    <system value="http://goodhealth.org/identifiers"/>
+    <value value="do-200"/>
+  </identifier>
+  <status value="active"/>
+  <intent value="original-order"/>
+  <code>
+    <coding>
+      <system value="http://lis.acmelabs.org/codes"/>
+      <code value="200"/>
+    </coding>
+  </code>
+  <subject>
+    <reference value="Patient/example"/>
+  </subject>
+  <reasonCode>
+    <coding>
+      <system value="http://www.icd10data.com/icd10pcs"/>
+      <code value="R78.71"/>
+      <display value="Abnormal lead level in blood"/>
+    </coding>
+    <text value="Abnormal lead level in blood"/>
+  </reasonCode>
+  <supportingInformation>
+    <reference value="Specimen/spec-uslab-example1"/>
+  </supportingInformation>
+  <note>
+    <text value="patient is afraid of needles"/>
+  </note>
+</DiagnosticRequest>

data/fixtures/{diagnostic_order → diagnostic_request}/do-300.xml

@@ -1,91 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DiagnosticOrder xmlns="http://hl7.org/fhir">
-  <id value="do-300"/>
-  <text>
-    <status value="generated"/>
-    <div xmlns="http://www.w3.org/1999/xhtml">
-      <p>
-        <b>Generated Narrative with Details</b>
-      </p>
-      <p>
-        <b>id</b>: do-300</p>
-      <p>
-        <b>subject</b>: 
-        <a href="Patient/patient-uslab-example1">Todd G. Lerr</a>
-      </p>
-      <p>
-        <b>orderer</b>: 
-        <a href="Practitioner/pract-uslab-example1">Leonard T Bloodraw</a>
-      </p>
-      <p>
-        <b>identifier</b>: PLAC = do-300</p>
-      <p>
-        <b>reason</b>: Other pneumonia, unspecified organism 
-        <span style="background: LightGoldenRodYellow ">(Details : {http://hl7.org/fhir/sid/icd-10-us code "J18.8" := "J18.8", given as "Other pneumonia, unspecified organism"})</span>
-      </p>
-      <p>
-        <b>specimen</b>: 
-        <a href="Specimen/spec-uslab-example1">Blood Specimen</a>
-      </p>
-      <p>
-        <b>status</b>: requested</p>
-      <p>
-        <b>priority</b>: routine</p>
-    </div>
-  </text>
-  <subject>
-    <reference value="Patient/patient-uslab-example1"/>
-    <display value="Todd G. Lerr"/>
-  </subject>
-  <orderer>
-    <reference value="Practitioner/pract-uslab-example1"/>
-    <display value="Leonard T Bloodraw"/>
-  </orderer>
-  <identifier>
-    <type>
-      <coding>
-        <code value="http://hl7.org/fhir/identifier-type"/>
-        <display value="PLAC"/>
-      </coding>
-    </type>
-    <system value="http://goodhealth.org/identifiers"/>
-    <value value="do-300"/>
-  </identifier>
-  <reason>
-    <coding>
-      <system value="http://hl7.org/fhir/sid/icd-10-us"/>
-      <code value="J18.8"/>
-      <display value="Other pneumonia, unspecified organism"/>
-    </coding>
-  </reason>
-  <specimen>
-    <reference value="Specimen/spec-uslab-example1"/>
-    <display value="Blood Specimen"/>
-  </specimen>
-  <status value="requested"/>
-  <priority value="routine"/>
-  <event>
-    <status value="requested"/>
-    <description>
-      <coding>
-        <code value="new-request"/>
-      </coding>
-    </description>
-    <dateTime value="2011-01-03T14:34:28-08:00"/>
-  </event>
-  <item>
-    <code>
-      <coding>
-        <system value="http://lis.acmelabs.org/codes"/>
-        <code value="300"/>
-        <display value="CBC_diff"/>
-      </coding>
-      <coding>
-        <system value="http://loinc.org"/>
-        <code value="57021-8"/>
-        <display value="CBC W Auto Differential panel in Blood"/>
-      </coding>
-    </code>
-    <status value="requested"/>
-  </item>
-</DiagnosticOrder>
+<?xml version="1.0" encoding="UTF-8"?>
+<DiagnosticRequest xmlns="http://hl7.org/fhir">
+  <id value="do-300"/>
+  <text>
+    <status value="generated"/>
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <p>
+        <b>Generated Narrative with Details</b>
+      </p>
+      <p>
+        <b>id</b>: do-300</p>
+      <p>
+        <b>subject</b>:
+        <a href="Patient/patient-uslab-example1">Todd G. Lerr</a>
+      </p>
+      <p>
+        <b>orderer</b>:
+        <a href="Practitioner/pract-uslab-example1">Leonard T Bloodraw</a>
+      </p>
+      <p>
+        <b>identifier</b>: PLAC = do-300</p>
+      <p>
+        <b>reason</b>: Other pneumonia, unspecified organism
+        <span style="background: LightGoldenRodYellow ">(Details : {http://hl7.org/fhir/sid/icd-10-us code "J18.8" := "J18.8", given as "Other pneumonia, unspecified organism"})</span>
+      </p>
+      <p>
+        <b>specimen</b>:
+        <a href="Specimen/spec-uslab-example1">Blood Specimen</a>
+      </p>
+      <p>
+        <b>status</b>: active</p>
+      <p>
+        <b>priority</b>: routine</p>
+    </div>
+  </text>
+  <identifier>
+    <type>
+      <coding>
+        <code value="http://hl7.org/fhir/identifier-type"/>
+        <display value="PLAC"/>
+      </coding>
+    </type>
+    <system value="http://goodhealth.org/identifiers"/>
+    <value value="do-300"/>
+  </identifier>
+  <status value="active"/>
+  <intent value="original-order"/>
+  <code>
+    <coding>
+      <system value="http://lis.acmelabs.org/codes"/>
+      <code value="300"/>
+    </coding>
+  </code>
+  <subject>
+    <reference value="Patient/patient-uslab-example1"/>
+    <display value="Todd G. Lerr"/>
+  </subject>
+  <requester>
+    <reference value="Practitioner/pract-uslab-example1"/>
+    <display value="Leonard T Bloodraw"/>
+  </requester>
+  <reasonCode>
+    <coding>
+      <system value="http://hl7.org/fhir/sid/icd-10-us"/>
+      <code value="J18.8"/>
+      <display value="Other pneumonia, unspecified organism"/>
+    </coding>
+  </reasonCode>
+  <supportingInformation>
+    <reference value="Specimen/spec-uslab-example1"/>
+    <display value="Blood Specimen"/>
+  </supportingInformation>
+</DiagnosticRequest>

data/{lib/tests/testscripts/xml/Connectathon11/Track7-LabOrderLabReport/_reference/resources/DiagnosticOrder → fixtures/diagnostic_request}/do-400.xml

@@ -1,88 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DiagnosticOrder xmlns="http://hl7.org/fhir">
-  <id value="do-400"/>
-  <text>
-    <status value="generated"/>
-    <div xmlns="http://www.w3.org/1999/xhtml">
-      <p>
-        <b>Generated Narrative with Details</b>
-      </p>
-      <p>
-        <b>id</b>: do-400</p>
-      <p>
-        <b>subject</b>: 
-        <a href="Patient/patient-uslab-example1">Todd G. Lerr</a>
-      </p>
-      <p>
-        <b>orderer</b>: 
-        <a href="Practitioner/pract-uslab-example1">Leonard T Bloodraw</a>
-      </p>
-      <p>
-        <b>identifier</b>: PLAC = do-400</p>
-      <p>
-        <b>reason</b>: DIARRHEA 
-        <span style="background: LightGoldenRodYellow ">(Details : {http://hl7.org/fhir/sid/icd-10-us code "R19.7" := "R19.7", given as "Diarrhea, unspecified"})</span>
-      </p>
-      <p>
-        <b>specimen</b>: 
-        <a href="Specimen/spec-400">Stool Specimen</a>
-      </p>
-      <p>
-        <b>status</b>: requested</p>
-      <p>
-        <b>priority</b>: routine</p>
-    </div>
-  </text>
-  <subject>
-    <reference value="Patient/patient-uslab-example1"/>
-    <display value="Todd G. Lerr"/>
-  </subject>
-  <orderer>
-    <reference value="Practitioner/pract-uslab-example1"/>
-    <display value="Leonard T Bloodraw"/>
-  </orderer>
-  <identifier>
-    <type>
-      <coding>
-        <code value="http://hl7.org/fhir/identifier-type"/>
-        <display value="PLAC"/>
-      </coding>
-    </type>
-    <system value="http://goodhealth.org/identifiers"/>
-    <value value="do-400"/>
-  </identifier>
-  <reason>
-    <coding>
-      <system value="http://hl7.org/fhir/sid/icd-10-us"/>
-      <code value="R19.7"/>
-      <display value="Diarrhea, unspecified"/>
-    </coding>
-    <text value="DIARRHEA"/>
-  </reason>
-  <specimen>
-    <reference value="Specimen/spec-400"/>
-    <display value="Stool Specimen"/>
-  </specimen>
-  <status value="requested"/>
-  <priority value="routine"/>
-  <event>
-    <status value="requested"/>
-    <description>
-      <coding>
-        <code value="new-request"/>
-      </coding>
-    </description>
-    <dateTime value="2014-12-05"/>
-  </event>
-  <item>
-    <code>
-      <coding>
-        <system value="http://lis.acmelabs.org/codes"/>
-        <code value="400"/>
-        <display value="Stool culture with Susceptibility"/>
-      </coding>
-      <text value="Stool Culture with Susceptibility Reflex"/>
-    </code>
-    <status value="requested"/>
-  </item>
-</DiagnosticOrder>
+<?xml version="1.0" encoding="UTF-8"?>
+<DiagnosticRequest xmlns="http://hl7.org/fhir">
+  <id value="do-400"/>
+  <text>
+    <status value="generated"/>
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <p>
+        <b>Generated Narrative with Details</b>
+      </p>
+      <p>
+        <b>id</b>: do-400</p>
+      <p>
+        <b>subject</b>:
+        <a href="Patient/patient-uslab-example1">Todd G. Lerr</a>
+      </p>
+      <p>
+        <b>orderer</b>:
+        <a href="Practitioner/pract-uslab-example1">Leonard T Bloodraw</a>
+      </p>
+      <p>
+        <b>identifier</b>: PLAC = do-400</p>
+      <p>
+        <b>reason</b>: DIARRHEA
+        <span style="background: LightGoldenRodYellow ">(Details : {http://hl7.org/fhir/sid/icd-10-us code "R19.7" := "R19.7", given as "Diarrhea, unspecified"})</span>
+      </p>
+      <p>
+        <b>specimen</b>:
+        <a href="Specimen/spec-400">Stool Specimen</a>
+      </p>
+      <p>
+        <b>status</b>: active</p>
+      <p>
+        <b>priority</b>: routine</p>
+    </div>
+  </text>
+  <identifier>
+    <type>
+      <coding>
+        <code value="http://hl7.org/fhir/identifier-type"/>
+        <display value="PLAC"/>
+      </coding>
+    </type>
+    <system value="http://goodhealth.org/identifiers"/>
+    <value value="do-400"/>
+  </identifier>
+  <status value="active"/>
+  <intent value="original-order"/>
+  <code>
+    <coding>
+      <system value="http://lis.acmelabs.org/codes"/>
+      <code value="400"/>
+    </coding>
+  </code>
+  <subject>
+    <reference value="Patient/patient-uslab-example1"/>
+    <display value="Todd G. Lerr"/>
+  </subject>
+  <requester>
+    <reference value="Practitioner/pract-uslab-example1"/>
+    <display value="Leonard T Bloodraw"/>
+  </requester>
+  <reasonCode>
+    <coding>
+      <system value="http://hl7.org/fhir/sid/icd-10-us"/>
+      <code value="R19.7"/>
+      <display value="Diarrhea, unspecified"/>
+    </coding>
+    <text value="DIARRHEA"/>
+  </reasonCode>
+  <supportingInformation>
+    <reference value="Specimen/spec-400"/>
+    <display value="Stool Specimen"/>
+  </supportingInformation>
+</DiagnosticRequest>