+ q6
authorEric Prud'hommeaux <eric@w3.org>
Thu, 07 Oct 2010 03:06:28 -0400
changeset 29 aead6064834c
parent 28 9e383d46fdc2
child 30 d5cb0312ef53
+ q6
syntheticPatients/AD_PCHR_1-tmo.trig
syntheticPatients/AD_PCHR_2-indivo.xml
syntheticPatients/AD_PCHR_2-tmo.trig
syntheticPatients/AD_PCHR_2.xml
syntheticPatients/AD_PCHR_3-tmo.trig
syntheticPatients/AD_PCHR_4-indivo.xml
syntheticPatients/AD_PCHR_4-tmo.trig
syntheticPatients/AD_PCHR_4.xml
syntheticPatients/AD_PCHR_5-tmo.trig
syntheticPatients/AD_PCHR_6-tmo.trig
syntheticPatients/AD_PCHR_7-tmo.trig
syntheticPatients/Indivo2Trig.xsl
syntheticPatients/Makefile
syntheticPatients/tests/q6.rq
syntheticPatients/tests/q6_1.srt
syntheticPatients/tests/q6_2.srt
syntheticPatients/tests/q6_3.srt
syntheticPatients/tests/q6_4.srt
syntheticPatients/tests/q6_5.srt
syntheticPatients/tests/q6_6.srt
syntheticPatients/tests/q6_7.srt
--- a/syntheticPatients/AD_PCHR_1-tmo.trig	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_1-tmo.trig	Thu Oct 07 03:06:28 2010 -0400
@@ -124,7 +124,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-15" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-15" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-15" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-15" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-15" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -134,7 +164,13 @@
 
     trans:workingDiagnosis "atrial fibrillation" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-17" ;
+        trans:testName "Rhythm ECG" ;
+        
+    ] ;
     
   ] .
 
@@ -144,7 +180,27 @@
 
     trans:workingDiagnosis "atrial fibrillation" ;
 
-    trans:reportedSymptoms "irregular pulse"
+    trans:reportedSymptoms "irregular pulse" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-18" ;
+        trans:testName "Ambry test " ;
+        
+    trans:result [
+        trans:variant_Synonyms "VKOR; MST134; MST576; VKCFD2; EDTP308; MGC2694; FLJ00289; IMAGE345520" ;
+    ] ;
+
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-18" ;
+        trans:testName "" ;
+        
+    trans:result [
+        trans:variant_Synonyms " CPC9; CYP2C; CYP2C10; MGC88320; P450IIC9; MGC149605; CYP2C9 " ;
+    ] ;
+
+    ] ;
     
   ] .
 
@@ -154,7 +210,7 @@
 
     trans:workingDiagnosis "none" ;
 
-    trans:reportedSymptoms "none"
+    trans:reportedSymptoms "none" ;
     
   ] .
 
@@ -164,7 +220,13 @@
 
     trans:workingDiagnosis "none" ;
 
-    trans:reportedSymptoms "none"
+    trans:reportedSymptoms "none" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-06-03" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
     
   ] .
 
@@ -174,7 +236,13 @@
 
     trans:workingDiagnosis "none" ;
 
-    trans:reportedSymptoms "none"
+    trans:reportedSymptoms "none" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-03" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
     
   ] .
 
@@ -184,7 +252,7 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms "Confusion, Declining memory"
+    trans:reportedSymptoms "Confusion, Declining memory" ;
     
   ] .
 
@@ -194,7 +262,35 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms " Confusion, Declining memory "
+    trans:reportedSymptoms " Confusion, Declining memory " ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-16" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-16" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-16" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-16" ;
+        trans:testName "ADmark Alzheimer's Evaluation" ;
+        
+    trans:result [
+        trans:variant_Synonyms "APOE4, NG_007084.2:g.7903T>C" ;
+    ] ;
+
+    ] ;
     
   ] .
 
@@ -204,7 +300,13 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-08-03" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
     
   ] .
 
@@ -214,7 +316,7 @@
 
     trans:workingDiagnosis "adverse event to Donepezil" ;
 
-    trans:reportedSymptoms "nausea"
+    trans:reportedSymptoms "nausea" ;
     
   ] .
 
@@ -224,7 +326,13 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-11-03" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_2-indivo.xml	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_2-indivo.xml	Thu Oct 07 03:06:28 2010 -0400
@@ -585,8 +585,7 @@
          </Test>
          <Test>
             <dateMeasured>2004-10-01</dateMeasured>
-            <name>Magnetic resonance imaging of brain and brain 
-</name>
+            <name>Magnetic resonance imaging of brain and brain</name>
             <HCLSresult>
                <LabTest>
                   <variant_Synonyms/>
@@ -651,8 +650,7 @@
          </Test>
          <Test>
             <dateMeasured>2005-04-01</dateMeasured>
-            <name>Magnetic resonance imaging of brain and brain 
-</name>
+            <name>Magnetic resonance imaging of brain and brain</name>
             <HCLSresult>
                <LabTest>
                   <variant_Synonyms/>
@@ -758,8 +756,7 @@
          </Test>
          <Test>
             <dateMeasured>2005-10-01</dateMeasured>
-            <name>Magnetic resonance imaging of brain and brain 
-</name>
+            <name>Magnetic resonance imaging of brain and brain</name>
             <HCLSresult>
                <LabTest>
                   <variant_Synonyms/>
@@ -824,8 +821,7 @@
          </Test>
          <Test>
             <dateMeasured>2006-04-01</dateMeasured>
-            <name>Magnetic resonance imaging of brain and brain 
-</name>
+            <name>Magnetic resonance imaging of brain and brain</name>
             <HCLSresult>
                <LabTest>
                   <variant_Synonyms/>
@@ -931,8 +927,7 @@
          </Test>
          <Test>
             <dateMeasured>2006-10-01</dateMeasured>
-            <name>Magnetic resonance imaging of brain and brain 
-</name>
+            <name>Magnetic resonance imaging of brain and brain</name>
             <HCLSresult>
                <LabTest>
                   <variant_Synonyms/>
@@ -1038,8 +1033,7 @@
          </Test>
          <Test>
             <dateMeasured>2007-10-01</dateMeasured>
-            <name>Magnetic resonance imaging of brain and brain 
-</name>
+            <name>Magnetic resonance imaging of brain and brain</name>
             <HCLSresult>
                <LabTest>
                   <variant_Synonyms/>
--- a/syntheticPatients/AD_PCHR_2-tmo.trig	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_2-tmo.trig	Thu Oct 07 03:06:28 2010 -0400
@@ -149,7 +149,7 @@
 
     trans:workingDiagnosis "mild cognitive impairment" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
     
   ] .
 
@@ -159,7 +159,13 @@
 
     trans:workingDiagnosis "mild cognitive impairment" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-07-17" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
     
   ] .
 
@@ -169,7 +175,43 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-07-20" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-07-20" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-07-20" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-07-20" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-07-20" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-07-20" ;
+        trans:testName "Syphilis test; quantitative" ;
+        
+    ] ;
     
   ] .
 
@@ -179,7 +221,47 @@
 
     trans:workingDiagnosis "mild cognitive impairment" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-10-01" ;
+        trans:testName "ADmark Alzheimer's Evaluation" ;
+        
+    trans:result [
+        trans:variant_Synonyms "APOE4, NG_007084.2:g.7903T>C" ;
+    ] ;
+
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-10-01" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2004-10-01" ;
+        trans:testName "Spinal tap" ;
+        
+    ] ;
     
   ] .
 
@@ -189,7 +271,37 @@
 
     trans:workingDiagnosis "mild cognitive impairment" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-04-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-04-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-04-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-04-01" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-04-01" ;
+        trans:testName "Spinal tap" ;
+        
+    ] ;
     
   ] .
 
@@ -199,7 +311,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-07-20" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-07-20" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-07-20" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-07-20" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-07-20" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -209,7 +351,37 @@
 
     trans:workingDiagnosis "mild cognitive impairment" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-10-01" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-10-01" ;
+        trans:testName "Spinal tap" ;
+        
+    ] ;
     
   ] .
 
@@ -219,7 +391,37 @@
 
     trans:workingDiagnosis "mild cognitive impairment" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-04-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-04-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-04-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-04-01" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-04-01" ;
+        trans:testName "Spinal tap" ;
+        
+    ] ;
     
   ] .
 
@@ -229,7 +431,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-07-20" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-07-20" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-07-20" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-07-20" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-07-20" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -239,7 +471,37 @@
 
     trans:workingDiagnosis "mild cognitive impairment" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-10-01" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2006-10-01" ;
+        trans:testName "Spinal tap" ;
+        
+    ] ;
     
   ] .
 
@@ -249,7 +511,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-07-18" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-07-18" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-07-18" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-07-18" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-07-18" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -259,7 +551,37 @@
 
     trans:workingDiagnosis "mild cognitive impairment" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-10-01" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-10-01" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-10-01" ;
+        trans:testName "Spinal tap" ;
+        
+    ] ;
     
   ] .
 
@@ -269,7 +591,13 @@
 
     trans:workingDiagnosis "none" ;
 
-    trans:reportedSymptoms "none"
+    trans:reportedSymptoms "none" ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-10-18" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
     
   ] .
 
@@ -279,7 +607,13 @@
 
     trans:workingDiagnosis "none" ;
 
-    trans:reportedSymptoms "none"
+    trans:reportedSymptoms "none" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-01-18" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
     
   ] .
 
@@ -289,7 +623,67 @@
 
     trans:workingDiagnosis "myocardial infarction" ;
 
-    trans:reportedSymptoms "chest pains"
+    trans:reportedSymptoms "chest pains" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "Rhythm ECG" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "Rhythm ECG" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "Rhythm ECG" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "TNI Biomarker" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "PT INR APTT Fibrogen" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-18" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
     
   ] .
 
@@ -299,7 +693,17 @@
 
     trans:workingDiagnosis "myocardial infarction" ;
 
-    trans:reportedSymptoms "myocardial infarction"
+    trans:reportedSymptoms "myocardial infarction" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-19" ;
+        trans:testName "" ;
+        
+    trans:result [
+        trans:variant_Synonyms "CYP2C19; RP11-400G3.4, CPCJ, CYP2C, P450C2C, P450IIC19" ;
+    ] ;
+
+    ] ;
     
   ] .
 
@@ -309,7 +713,13 @@
 
     trans:workingDiagnosis "anxiety depression" ;
 
-    trans:reportedSymptoms "Depression"
+    trans:reportedSymptoms "Depression" ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-05-16" ;
+        trans:testName "Depression Questionnaire" ;
+        
+    ] ;
     
   ] .
 
@@ -319,7 +729,17 @@
 
     trans:workingDiagnosis "myocardial infarction" ;
 
-    trans:reportedSymptoms "depression"
+    trans:reportedSymptoms "depression" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-05-17" ;
+        trans:testName "" ;
+        
+    trans:result [
+        trans:variant_Synonyms " RP4-669P10.2, CPD6, CYP2D, [email protected], CYP2DL1, MGC120389, MGC120390, P450-DB1, P450C2D, P450DB1" ;
+    ] ;
+
+    ] ;
     
   ] .
 
@@ -329,7 +749,13 @@
 
     trans:workingDiagnosis "anxiety depression" ;
 
-    trans:reportedSymptoms "Depression"
+    trans:reportedSymptoms "Depression" ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-05-18" ;
+        trans:testName "Depression Questionnaire" ;
+        
+    ] ;
     
   ] .
 
@@ -339,7 +765,13 @@
 
     trans:workingDiagnosis "anxiety depression" ;
 
-    trans:reportedSymptoms "Depression"
+    trans:reportedSymptoms "Depression" ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-06-18" ;
+        trans:testName "Depression Questionnaire" ;
+        
+    ] ;
     
   ] .
 
@@ -349,7 +781,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-07-20" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-07-20" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-07-20" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-07-20" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-07-20" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -359,7 +821,7 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms "Confusion, Declining memory"
+    trans:reportedSymptoms "Confusion, Declining memory" ;
     
   ] .
 
@@ -369,7 +831,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-20" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-20" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-20" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-20" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-20" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_2.xml	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_2.xml	Thu Oct 07 03:06:28 2010 -0400
@@ -836,8 +836,7 @@
 
     <test x_2="ICD9 Procedure">
        <ICD9_Procedure>88.91</ICD9_Procedure>
-       <testName>Magnetic resonance imaging of brain and brain 
-</testName>
+       <testName>Magnetic resonance imaging of brain and brain</testName>
        <referredTo>David Tork</referredTo>
        <referredClinic>Warrington Hospital</referredClinic>
        <referredBy>Bill Stall</referredBy>
@@ -921,8 +920,7 @@
 
     <test x_2="ICD9 Procedure">
        <ICD9_Procedure>88.91</ICD9_Procedure>
-       <testName>Magnetic resonance imaging of brain and brain 
-</testName>
+       <testName>Magnetic resonance imaging of brain and brain</testName>
        <referredTo>David Tork</referredTo>
        <referredClinic>Warrington Hospital</referredClinic>
        <referredBy>Bill Stall</referredBy>
@@ -1321,8 +1319,7 @@
 
     <test x_2="ICD9 Procedure">
        <ICD9_Procedure>88.91</ICD9_Procedure>
-       <testName>Magnetic resonance imaging of brain and brain 
-</testName>
+       <testName>Magnetic resonance imaging of brain and brain</testName>
        <referredTo>David Tork</referredTo>
        <referredClinic>Warrington Hospital</referredClinic>
        <referredBy>Bill Stall</referredBy>
@@ -1409,8 +1406,7 @@
 
     <test x_2="ICD9 Procedure">
        <ICD9_Procedure>88.91</ICD9_Procedure>
-       <testName>Magnetic resonance imaging of brain and brain 
-</testName>
+       <testName>Magnetic resonance imaging of brain and brain</testName>
        <referredTo>David Tork</referredTo>
        <referredClinic>Warrington Hospital</referredClinic>
        <referredBy>Bill Stall</referredBy>
@@ -1810,8 +1806,7 @@
 
     <test x_2="ICD9 Procedure">
        <ICD9_Procedure>88.91</ICD9_Procedure>
-       <testName>Magnetic resonance imaging of brain and brain 
-</testName>
+       <testName>Magnetic resonance imaging of brain and brain</testName>
        <referredTo>David Tork</referredTo>
        <referredClinic>Warrington Hospital</referredClinic>
        <referredBy>Bill Stall</referredBy>
@@ -2205,8 +2200,7 @@
 
     <test x_2="ICD9 Procedure">
        <ICD9_Procedure>88.91</ICD9_Procedure>
-       <testName>Magnetic resonance imaging of brain and brain 
-</testName>
+       <testName>Magnetic resonance imaging of brain and brain</testName>
        <referredTo>David Tork</referredTo>
        <referredClinic>Warrington Hospital</referredClinic>
        <referredBy>Bill Stall</referredBy>
--- a/syntheticPatients/AD_PCHR_3-tmo.trig	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_3-tmo.trig	Thu Oct 07 03:06:28 2010 -0400
@@ -116,7 +116,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "1996-09-12" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "1996-09-12" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "1996-09-12" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "1996-09-12" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "1996-09-12" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -126,7 +156,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2002-07-15" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2002-07-15" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2002-07-15" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2002-07-15" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2002-07-15" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -136,7 +196,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-05" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-05" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-05" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-05" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-05" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -146,7 +236,31 @@
 
     trans:workingDiagnosis "Alzheimer's disease" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2003-17-05" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2003-17-05" ;
+        trans:testName "Mini-mental state examination" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2003-17-05" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2003-17-05" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -156,7 +270,49 @@
 
     trans:workingDiagnosis "Alzheimer's disease" ;
 
-    trans:reportedSymptoms "Declining memory"
+    trans:reportedSymptoms "Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-12-05" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-12-05" ;
+        trans:testName "Mini-mental state examination" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-12-05" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-12-05" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-12-05" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-12-05" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2005-12-05" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -166,7 +322,19 @@
 
     trans:workingDiagnosis "Alzheimer's disease" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-10-15" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2007-10-15" ;
+        trans:testName "Mini-mental state examination" ;
+        
+    ] ;
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_4-indivo.xml	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_4-indivo.xml	Thu Oct 07 03:06:28 2010 -0400
@@ -442,8 +442,7 @@
       <LabTests>
          <Test>
             <dateMeasured>2009-07-15</dateMeasured>
-            <name>Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and 
-	automated differential WBC count</name>
+            <name>Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count</name>
             <status>@@@</status>
          </Test>
          <Test>
@@ -500,8 +499,7 @@
          </Test>
          <Test>
             <dateMeasured>2009-07-16</dateMeasured>
-            <name>Magnetic resonance imaging of brain and brain 
-	</name>
+            <name>Magnetic resonance imaging of brain and brain</name>
             <HCLSresult>
                <LabTest>
                   <variant_Synonyms/>
--- a/syntheticPatients/AD_PCHR_4-tmo.trig	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_4-tmo.trig	Thu Oct 07 03:06:28 2010 -0400
@@ -98,7 +98,37 @@
 
     trans:workingDiagnosis "epilepsy" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2001-06-15" ;
+        trans:testName "HLA-B 1502 Genotype; Carbamazepine Hypersensitivity" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2001-06-15" ;
+        trans:testName "Cytochrome P450 1A2 Genotyping" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2001-06-15" ;
+        trans:testName "Cytochrome P450 2C9 Genotyping" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2001-06-15" ;
+        trans:testName "Cytochrome P450 2C19 Genotyping" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2001-06-15" ;
+        trans:testName "Cytochrome P450 2C19 Genotyping" ;
+        
+    ] ;
     
   ] .
 
@@ -108,7 +138,19 @@
 
     trans:workingDiagnosis "Urea Metabolism Disorder" ;
 
-    trans:reportedSymptoms "Nausea"
+    trans:reportedSymptoms "Nausea" ;
+
+    trans:test [
+        # indivo:dateMeasured "2003-07-15" ;
+        trans:testName "Ornithine Transcarbamylase Genotyping" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2003-07-15" ;
+        trans:testName "carbamoyl-phosphate synthetase 1 genotyping" ;
+        
+    ] ;
     
   ] .
 
@@ -118,7 +160,13 @@
 
     trans:workingDiagnosis "none" ;
 
-    trans:reportedSymptoms "none"
+    trans:reportedSymptoms "none" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-01-20" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
     
   ] .
 
@@ -128,7 +176,37 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms " Confusion, Declining memory "
+    trans:reportedSymptoms " Confusion, Declining memory " ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-15" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-15" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-15" ;
+        trans:testName "" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-15" ;
+        trans:testName "Comprehensive metabolic panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-15" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -138,7 +216,29 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms " Confusion, Declining memory "
+    trans:reportedSymptoms " Confusion, Declining memory " ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-16" ;
+        trans:testName "Other psychologic evaluation and testing" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-16" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-16" ;
+        trans:testName "ADmark Alzheimer's Evaluation" ;
+        
+    trans:result [
+        trans:variant_Synonyms "APOE4, NG_007084.2:g.7903T>C" ;
+    ] ;
+
+    ] ;
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_4.xml	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_4.xml	Thu Oct 07 03:06:28 2010 -0400
@@ -623,8 +623,7 @@
 		</physicalObervations>
 		<test x_2="Laboratory">   
 		   <CPT>85025</CPT>
-		   <testName>Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and 
-	automated differential WBC count</testName>
+		   <testName>Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count</testName>
 		   <referredTo>Janet Night</referredTo>
 		   <referredClinic>Family Health Laboratories</referredClinic>
 		   <referredBy>Margaret Cho</referredBy>
@@ -1007,8 +1006,7 @@
 
 		<test x_2="ICD9 Procedure">
 		   <ICD9_Procedure>88.91</ICD9_Procedure>
-		   <testName>Magnetic resonance imaging of brain and brain 
-	</testName>
+		   <testName>Magnetic resonance imaging of brain and brain</testName>
 		   <referredTo>Michael Dolenz</referredTo>
 		   <referredClinic>Warrington Hospital</referredClinic>
 		   <referredBy>Margaret Cho</referredBy>
--- a/syntheticPatients/AD_PCHR_5-tmo.trig	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_5-tmo.trig	Thu Oct 07 03:06:28 2010 -0400
@@ -144,7 +144,7 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
     
   ] .
 
@@ -154,7 +154,19 @@
 
     trans:workingDiagnosis "hypertension" ;
 
-    trans:reportedSymptoms "headache, somnolence"
+    trans:reportedSymptoms "headache, somnolence" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-02" ;
+        trans:testName "Rhythm ECG" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-03-02" ;
+        trans:testName "Mini-mental state examination" ;
+        
+    ] ;
     
   ] .
 
@@ -164,7 +176,43 @@
 
     trans:workingDiagnosis "acute coronary syndrome" ;
 
-    trans:reportedSymptoms "chest pain, nausea, diaphoresis"
+    trans:reportedSymptoms "chest pain, nausea, diaphoresis" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-05-06" ;
+        trans:testName "Blood Test" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-05-06" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-05-06" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-05-06" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-05-06" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-05-06" ;
+        trans:testName "Mini-mental state examination" ;
+        
+    ] ;
     
   ] .
 
@@ -174,7 +222,19 @@
 
     trans:workingDiagnosis "gastroesophageal reflux disease" ;
 
-    trans:reportedSymptoms "dysphagia, nausea"
+    trans:reportedSymptoms "dysphagia, nausea" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-06-18" ;
+        trans:testName "Mini-mental state examination" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-06-18" ;
+        trans:testName "Magnetic resonance imaging of brain and brain" ;
+        
+    ] ;
     
   ] .
 
@@ -184,7 +244,7 @@
 
     trans:workingDiagnosis "alzheimer's disease" ;
 
-    trans:reportedSymptoms "memory loss"
+    trans:reportedSymptoms "memory loss" ;
     
   ] .
 
@@ -194,7 +254,7 @@
 
     trans:workingDiagnosis "adverse drug effect" ;
 
-    trans:reportedSymptoms "nausea and vomiting"
+    trans:reportedSymptoms "nausea and vomiting" ;
     
   ] .
 
@@ -204,7 +264,7 @@
 
     trans:workingDiagnosis "referral for trial" ;
 
-    trans:reportedSymptoms ""
+    trans:reportedSymptoms "" ;
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_6-tmo.trig	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_6-tmo.trig	Thu Oct 07 03:06:28 2010 -0400
@@ -83,7 +83,37 @@
 
     trans:workingDiagnosis "false" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-10" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-10" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-10" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-10" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-05-10" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
     
   ] .
 
@@ -93,7 +123,25 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms "Confusion, Declining memory"
+    trans:reportedSymptoms "Confusion, Declining memory" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-15" ;
+        trans:testName "Syphilis test; quantitative" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-15" ;
+        trans:testName "Administration of psychologic test" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-15" ;
+        trans:testName "Magnetic resonance imaging of brain and brain stem" ;
+        
+    ] ;
     
   ] .
 
@@ -103,7 +151,23 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-20" ;
+        trans:testName "Alzheimer's Disease Assessment Scale-cognitive subscale" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-07-20" ;
+        trans:testName "ADmark Alzheimer's Evaluation" ;
+        
+    trans:result [
+        trans:variant_Synonyms "APOE4, NG_007084.2:g.7903T>C" ;
+    ] ;
+
+    ] ;
     
   ] .
 
@@ -115,7 +179,13 @@
 
     trans:workingDiagnosis "Abnormal gait" ;
 
-    trans:reportedSymptoms "Depression, gait problems"
+    trans:reportedSymptoms "Depression, gait problems" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-09-15" ;
+        trans:testName "Administration of psychologic test" ;
+        
+    ] ;
     
   ] .
 
@@ -125,7 +195,19 @@
 
     trans:workingDiagnosis "Major Depression" ;
 
-    trans:reportedSymptoms "Depression"
+    trans:reportedSymptoms "Depression" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-11-09" ;
+        trans:testName "Rhythm ECG" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-11-09" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
     
   ] .
 
@@ -135,7 +217,13 @@
 
     trans:workingDiagnosis "referral to endocrinologist" ;
 
-    trans:reportedSymptoms "none"
+    trans:reportedSymptoms "none" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-11-16" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_7-tmo.trig	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/AD_PCHR_7-tmo.trig	Thu Oct 07 03:06:28 2010 -0400
@@ -67,7 +67,49 @@
 
     trans:workingDiagnosis "true" ;
 
-    trans:reportedSymptoms "true"
+    trans:reportedSymptoms "true" ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-15" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-15" ;
+        trans:testName "Lipid panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-15" ;
+        trans:testName "Hepatic function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-15" ;
+        trans:testName "Renal function panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-15" ;
+        trans:testName "Thyroid stimulating hormone (TSH)" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-15" ;
+        trans:testName "Corticotropic Releasing Hormone Stimulation Panel" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2008-11-15" ;
+        trans:testName "CoagulationBattery" ;
+        
+    ] ;
     
   ] .
 
@@ -77,7 +119,25 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms "Confusion, Becomes lost"
+    trans:reportedSymptoms "Confusion, Becomes lost" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-01-15" ;
+        trans:testName "Administration of psychologic test" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-01-15" ;
+        trans:testName "Magnetic resonance imaging of brain and brain stem" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-01-15" ;
+        trans:testName "Blood count; complete (CBC), automated (Hgb, Hct, RBC, WBC and platelet count) and automated differential WBC count" ;
+        
+    ] ;
     
   ] .
 
@@ -87,7 +147,23 @@
 
     trans:workingDiagnosis "Dementia" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-01-20" ;
+        trans:testName "Alzheimer's Disease Assessment Scale-cognitive subscale" ;
+        
+    ] ;
+
+    trans:test [
+        # indivo:dateMeasured "2009-01-20" ;
+        trans:testName "ADmark Alzheimer's Evaluation" ;
+        
+    trans:result [
+        trans:variant_Synonyms "APOE4, NG_007084.2:g.7903T>C" ;
+    ] ;
+
+    ] ;
     
   ] .
 
@@ -97,7 +173,7 @@
 
     trans:workingDiagnosis "Alzheimers Disease" ;
 
-    trans:reportedSymptoms "false"
+    trans:reportedSymptoms "false" ;
     
   ] .
 
--- a/syntheticPatients/Indivo2Trig.xsl	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/Indivo2Trig.xsl	Thu Oct 07 03:06:28 2010 -0400
@@ -122,8 +122,8 @@
     trans:patient _:patient ;
     trans:dateOfEncounter <xsl:apply-templates mode="date" select="in:Date"/> ;
 <xsl:apply-templates select="in:WorkingDiagnosis/in:PreliminaryDiagnosis"/>
-    trans:reportedSymptoms "<xsl:value-of select="in:ReportedSymptoms/text()"/>"
-    
+    trans:reportedSymptoms "<xsl:value-of select="in:ReportedSymptoms/text()"/>" ;
+<xsl:apply-templates select="in:LabTests/in:Test"/>    
   ] .
 </xsl:template>
 
@@ -131,6 +131,24 @@
     trans:workingDiagnosis "<xsl:value-of select="in:DiagnosisDescription/text()"/>" ;
 </xsl:template>
 
+<xsl:template match="in:Test">
+    trans:test [
+        # indivo:dateMeasured <xsl:apply-templates mode="date" select="in:dateMeasured"/> ;
+        trans:testName "<xsl:value-of select="in:name/text()"/>" ;
+        <xsl:apply-templates select="in:result"/><xsl:apply-templates select="in:SNPresult"/>
+    ] ;
+</xsl:template>
+
+<xsl:template match="in:result">
+    # @@not done ;
+</xsl:template>
+
+<xsl:template match="in:SNPresult">
+    trans:result [
+        trans:variant_Synonyms "<xsl:value-of select="in:LabTest/in:variant_Synonyms/text()"/>" ;
+    ] ;
+</xsl:template>
+
 <!-- Utility templates
 -->
 
--- a/syntheticPatients/Makefile	Thu Oct 07 01:43:19 2010 -0400
+++ b/syntheticPatients/Makefile	Thu Oct 07 03:06:28 2010 -0400
@@ -45,6 +45,7 @@
 MBOXES := $(subst AD_PCHR_, mbox_, $(INPUTLIST))
 Q1S := $(subst AD_PCHR_, q1_, $(INPUTLIST))
 Q4S := $(subst AD_PCHR_, q4_, $(INPUTLIST))
+Q6S := $(subst AD_PCHR_, q6_, $(INPUTLIST))
 #$(error TMOLIST: $(TMOLIST))
 
 mbox_%: AD_PCHR_%-tmo.trig tests/email_%.srt
@@ -56,7 +57,10 @@
 q4_%: AD_PCHR_%-tmo.trig tests/q4.rq tests/q4_%.srt
 	$(SPARQL) -qg pchr $(word 1, $^) $(word 2, $^) --compare $(word 3, $^) || echo $<:0: error: data\\n$(word 2, $^):0: note: query\\n$(word 3, $^):0: note: expected results
 
-test: all $(MBOXES) $(Q1S) $(Q4S)
+q6_%: AD_PCHR_%-tmo.trig tests/q6.rq tests/q6_%.srt
+	$(SPARQL) -qd $(word 1, $^) $(word 2, $^) --compare $(word 3, $^) || echo $<:0: error: data\\n$(word 2, $^):0: note: query\\n$(word 3, $^):0: note: expected results
+
+test: all $(MBOXES) $(Q1S) $(Q4S) $(Q6S)
 
 clean:
 	rm -f *-indivo.xml *-tmo.trig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syntheticPatients/tests/q6.rq	Thu Oct 07 03:06:28 2010 -0400
@@ -0,0 +1,20 @@
+PREFIX trans: <tag:[email protected]:2009/tmo/translator#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+
+SELECT distinct (?name) ?patient ?testname ?apoe4
+
+WHERE {
+ ?encounter trans:patient ?patient .
+ ?patient foaf:name ?name .
+ ?patient trans:hasCondition ?condition .
+ ?condition trans:diagnosedWith ?diagnosis .
+ FILTER (regex (?diagnosis, "alzheimer", "i"))
+
+OPTIONAL {
+ ?encounter trans:test ?test .
+ ?test trans:testName ?testname .
+ ?test trans:result ?result .
+ ?result trans:variant_Synonyms ?apoe4
+ FILTER (regex (?apoe4, "APOE4"))
+}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syntheticPatients/tests/q6_1.srt	Thu Oct 07 03:06:28 2010 -0400
@@ -0,0 +1,5 @@
++----------------------+----------+---------------------------------+--------------------------------+
+| ?name                | ?patient | ?testname                       | ?apoe4                         |
+| "George Andrew Tour" | _:x      |                              -- |                             -- |
+| "George Andrew Tour" | _:x      | "ADmark Alzheimer's Evaluation" | "APOE4, NG_007084.2:g.7903T>C" |
++----------------------+----------+---------------------------------+--------------------------------+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syntheticPatients/tests/q6_2.srt	Thu Oct 07 03:06:28 2010 -0400
@@ -0,0 +1,5 @@
++--------------------+----------+---------------------------------+--------------------------------+
+| ?name              | ?patient | ?testname                       | ?apoe4                         |
+| "Monica Mary Mall" | _:x      |                              -- |                             -- |
+| "Monica Mary Mall" | _:x      | "ADmark Alzheimer's Evaluation" | "APOE4, NG_007084.2:g.7903T>C" |
++--------------------+----------+---------------------------------+--------------------------------+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syntheticPatients/tests/q6_3.srt	Thu Oct 07 03:06:28 2010 -0400
@@ -0,0 +1,4 @@
++---------------+----------+-----------+--------+
+| ?name         | ?patient | ?testname | ?apoe4 |
+| "Benny Smith" | _:x      |        -- |     -- |
++---------------+----------+-----------+--------+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syntheticPatients/tests/q6_4.srt	Thu Oct 07 03:06:28 2010 -0400
@@ -0,0 +1,5 @@
++------------------+----------+---------------------------------+--------------------------------+
+| ?name            | ?patient | ?testname                       | ?apoe4                         |
+| "Edward Quesada" | _:x      |                              -- |                             -- |
+| "Edward Quesada" | _:x      | "ADmark Alzheimer's Evaluation" | "APOE4, NG_007084.2:g.7903T>C" |
++------------------+----------+---------------------------------+--------------------------------+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syntheticPatients/tests/q6_5.srt	Thu Oct 07 03:06:28 2010 -0400
@@ -0,0 +1,4 @@
++------------------------+----------+-----------+--------+
+| ?name                  | ?patient | ?testname | ?apoe4 |
+| "Georg Steffen Möller" | _:x      |        -- |     -- |
++------------------------+----------+-----------+--------+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syntheticPatients/tests/q6_6.srt	Thu Oct 07 03:06:28 2010 -0400
@@ -0,0 +1,3 @@
++-------+----------+-----------+--------+
+| ?name | ?patient | ?testname | ?apoe4 |
++-------+----------+-----------+--------+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syntheticPatients/tests/q6_7.srt	Thu Oct 07 03:06:28 2010 -0400
@@ -0,0 +1,5 @@
++---------------------------------+----------+---------------------------------+--------------------------------+
+| ?name                           | ?patient | ?testname                       | ?apoe4                         |
+| "Julianne Sarah Christopherson" | _:x      |                              -- |                             -- |
+| "Julianne Sarah Christopherson" | _:x      | "ADmark Alzheimer's Evaluation" | "APOE4, NG_007084.2:g.7903T>C" |
++---------------------------------+----------+---------------------------------+--------------------------------+