+ genericName
authorEric Prud'hommeaux <eric@w3.org>
Tue, 05 Oct 2010 05:31:13 -0400
changeset 23 e1ac5e425b23
parent 22 ab7272a2a335
child 24 67d55bae74c4
+ genericName
syntheticPatients/AD_PCHR_1-tmo.trig
syntheticPatients/AD_PCHR_2-indivo.xml
syntheticPatients/AD_PCHR_2-tmo.trig
syntheticPatients/AD_PCHR_3-indivo.xml
syntheticPatients/AD_PCHR_3-tmo.trig
syntheticPatients/AD_PCHR_4-indivo.xml
syntheticPatients/AD_PCHR_4-tmo.trig
syntheticPatients/AD_PCHR_5-indivo.xml
syntheticPatients/AD_PCHR_5-tmo.trig
syntheticPatients/AD_PCHR_6-indivo.xml
syntheticPatients/AD_PCHR_6-tmo.trig
syntheticPatients/AD_PCHR_7-tmo.trig
--- a/syntheticPatients/AD_PCHR_1-tmo.trig	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_1-tmo.trig	Tue Oct 05 05:31:13 2010 -0400
@@ -2,6 +2,7 @@
   @prefix : <tag:[email protected]:2009/tmo/translator#> .
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
+  @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
   @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
 {
 _:patient  a trans:Patient ;
@@ -42,28 +43,28 @@
 
   [ a trans:Prescription ;
     trans:prescribedTo _:patient ;
-    trans:prescribedOn "2009-05-15" ; 
+    indivo:prescribedOn "2009-05-15" ; 
 
     trans:genericName "COREG TABLETS" ;    
   ] .
 
   [ a trans:Prescription ;
     trans:prescribedTo _:patient ;
-    trans:prescribedOn "2009-05-20" ; 
+    indivo:prescribedOn "2009-05-20" ; 
 
     trans:genericName "LIPITOR TABLETS" ;    
   ] .
 
   [ a trans:Prescription ;
     trans:prescribedTo _:patient ;
-    trans:prescribedOn "2009-05-20" ; 
+    indivo:prescribedOn "2009-05-20" ; 
 
     trans:genericName "COUMADIN TABLETS" ;    
   ] .
 
   [ a trans:Prescription ;
     trans:prescribedTo _:patient ;
-    trans:prescribedOn "2009-08-10" ; 
+    indivo:prescribedOn "2009-08-10" ; 
  
     trans:datePrescriptionEnded "2009-08-15" ;
 
@@ -72,7 +73,7 @@
 
   [ a trans:Prescription ;
     trans:prescribedTo _:patient ;
-    trans:prescribedOn "2009-08-15" ; 
+    indivo:prescribedOn "2009-08-15" ; 
 
     trans:genericName "ARICEPT TABLETS ORALLY DISINTEGRATING" ;    
   ] .
--- a/syntheticPatients/AD_PCHR_2-indivo.xml	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_2-indivo.xml	Tue Oct 05 05:31:13 2010 -0400
@@ -60,7 +60,7 @@
             <medication>
                <dateStarted>2007-07-20</dateStarted>
                <name type="http://indivo.org/codes/ndc">26053006601</name>
-               <brandName/>
+               <genericName>ATORVASTATIN TABLET</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -83,7 +83,7 @@
             <medication>
                <dateStarted>2007-07-20</dateStarted>
                <name type="http://indivo.org/codes/ndc">63739043401</name>
-               <brandName/>
+               <genericName>CHEWABLE ORANGE ASPIRIN TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -106,7 +106,7 @@
             <medication>
                <dateStarted>2008-03-20</dateStarted>
                <name type="http://indivo.org/codes/ndc">55111019690</name>
-               <brandName/>
+               <genericName>CLOPIDOGREL TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -130,7 +130,7 @@
                <dateStarted>2008-03-20</dateStarted>
                <dateStopped>2009-08-15</dateStopped>
                <name type="http://indivo.org/codes/ndc">54569597500</name>
-               <brandName/>
+               <genericName>CARVEDILOL TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -153,7 +153,7 @@
             <medication>
                <dateStarted>2008-05-18</dateStarted>
                <name type="http://indivo.org/codes/ndc">54569529101</name>
-               <brandName/>
+               <genericName>FLUOXETINE CAPSULES</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -177,7 +177,7 @@
                <dateStarted>2008-05-18</dateStarted>
                <dateStopped>2009-08-15</dateStopped>
                <name type="http://indivo.org/codes/ndc">54569476401</name>
-               <brandName/>
+               <genericName>DIAZEPAM TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -200,7 +200,7 @@
             <medication>
                <dateStarted>2009-10-15</dateStarted>
                <name type="http://indivo.org/codes/ndc">54907010101</name>
-               <brandName/>
+               <genericName>MEMANTINE HYDROCHLORIDE</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
--- a/syntheticPatients/AD_PCHR_2-tmo.trig	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_2-tmo.trig	Tue Oct 05 05:31:13 2010 -0400
@@ -2,6 +2,7 @@
   @prefix : <tag:[email protected]:2009/tmo/translator#> .
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
+  @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
   @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
 {
 _:patient  a trans:Patient ;
@@ -39,8 +40,61 @@
       
   . 
 
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2007-07-20" ; 
+
+    trans:genericName "ATORVASTATIN TABLET" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2007-07-20" ; 
+
+    trans:genericName "CHEWABLE ORANGE ASPIRIN TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2008-03-20" ; 
+
+    trans:genericName "CLOPIDOGREL TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2008-03-20" ; 
+ 
+    trans:datePrescriptionEnded "2009-08-15" ;
+
+    trans:genericName "CARVEDILOL TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2008-05-18" ; 
+
+    trans:genericName "FLUOXETINE CAPSULES" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2008-05-18" ; 
+ 
+    trans:datePrescriptionEnded "2009-08-15" ;
+
+    trans:genericName "DIAZEPAM TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2009-10-15" ; 
+
+    trans:genericName "MEMANTINE HYDROCHLORIDE" ;    
+  ] .
+
   _:patient trans:hasCondition [
-  trans:onset "2004-07-10T12:00:00"^^xsd:dateTime ;
+  trans:onset "2004-07-10T12:00:00" ;
 
   trans:diagnosedWith "mild cognitive impairment" ;
 
@@ -49,7 +103,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2007-07-20T12:00:00"^^xsd:dateTime ;
+  trans:onset "2007-07-20T12:00:00" ;
 
   trans:diagnosedWith "hypercholesterolaemia" ;
 
@@ -58,7 +112,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2008-03-18T12:00:00"^^xsd:dateTime ;
+  trans:onset "2008-03-18T12:00:00" ;
 
   trans:diagnosedWith "myocardial infarction" ;
 
@@ -67,7 +121,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2008-05-16T12:00:00"^^xsd:dateTime ;
+  trans:onset "2008-05-16T12:00:00" ;
 
   trans:diagnosedWith "anxiety depression" ;
 
@@ -76,7 +130,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-10-15T12:00:00"^^xsd:dateTime ;
+  trans:onset "2009-10-15T12:00:00" ;
 
   trans:diagnosedWith "alzheimer’s disease" ;
 
@@ -84,187 +138,233 @@
   # unmatched diagnosedBy
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2004-07-10"^^xsd:dateTime ;
-
-    :reportedSymptoms "Declining memory"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2004-07-17"^^xsd:dateTime ;
-
-    :reportedSymptoms "Declining memory"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2004-07-20"^^xsd:dateTime ;
-
-    :reportedSymptoms "false"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2004-10-01"^^xsd:dateTime ;
-
-    :reportedSymptoms "Declining memory"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2005-04-01"^^xsd:dateTime ;
-
-    :reportedSymptoms "Declining memory"
-    
-  ] .
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2004-07-10" ;
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2005-07-20"^^xsd:dateTime ;
-
-    :reportedSymptoms "false"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2005-10-01"^^xsd:dateTime ;
-
-    :reportedSymptoms "Declining memory"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2006-04-01"^^xsd:dateTime ;
+    trans:workingDiagnosis "mild cognitive impairment" ;
 
-    :reportedSymptoms "Declining memory"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2006-07-20"^^xsd:dateTime ;
-
-    :reportedSymptoms "false"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2006-10-01"^^xsd:dateTime ;
-
-    :reportedSymptoms "Declining memory"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2007-07-18"^^xsd:dateTime ;
-
-    :reportedSymptoms "false"
+    trans:reportedSymptoms "Declining memory"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2007-10-01"^^xsd:dateTime ;
-
-    :reportedSymptoms "Declining memory"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2007-10-18"^^xsd:dateTime ;
-
-    :reportedSymptoms "none"
-    
-  ] .
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2004-07-17" ;
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-01-18"^^xsd:dateTime ;
-
-    :reportedSymptoms "none"
-    
-  ] .
+    trans:workingDiagnosis "mild cognitive impairment" ;
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-03-18"^^xsd:dateTime ;
-
-    :reportedSymptoms "chest pains"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-03-19"^^xsd:dateTime ;
-
-    :reportedSymptoms "myocardial infarction"
+    trans:reportedSymptoms "Declining memory"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2005-05-16"^^xsd:dateTime ;
-
-    :reportedSymptoms "Depression"
-    
-  ] .
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2004-07-20" ;
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-05-17"^^xsd:dateTime ;
+    trans:workingDiagnosis "false" ;
 
-    :reportedSymptoms "depression"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2005-05-18"^^xsd:dateTime ;
-
-    :reportedSymptoms "Depression"
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2005-06-18"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2004-10-01" ;
 
-    :reportedSymptoms "Depression"
+    trans:workingDiagnosis "mild cognitive impairment" ;
+
+    trans:reportedSymptoms "Declining memory"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-07-20"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2005-04-01" ;
 
-    :reportedSymptoms "false"
+    trans:workingDiagnosis "mild cognitive impairment" ;
+
+    trans:reportedSymptoms "Declining memory"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-15"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2005-07-20" ;
 
-    :reportedSymptoms "Confusion, Declining memory"
+    trans:workingDiagnosis "false" ;
+
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-20"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2005-10-01" ;
 
-    :reportedSymptoms "false"
+    trans:workingDiagnosis "mild cognitive impairment" ;
+
+    trans:reportedSymptoms "Declining memory"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2006-04-01" ;
+
+    trans:workingDiagnosis "mild cognitive impairment" ;
+
+    trans:reportedSymptoms "Declining memory"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2006-07-20" ;
+
+    trans:workingDiagnosis "false" ;
+
+    trans:reportedSymptoms "false"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2006-10-01" ;
+
+    trans:workingDiagnosis "mild cognitive impairment" ;
+
+    trans:reportedSymptoms "Declining memory"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2007-07-18" ;
+
+    trans:workingDiagnosis "false" ;
+
+    trans:reportedSymptoms "false"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2007-10-01" ;
+
+    trans:workingDiagnosis "mild cognitive impairment" ;
+
+    trans:reportedSymptoms "Declining memory"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2007-10-18" ;
+
+    trans:workingDiagnosis "none" ;
+
+    trans:reportedSymptoms "none"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-01-18" ;
+
+    trans:workingDiagnosis "none" ;
+
+    trans:reportedSymptoms "none"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-03-18" ;
+
+    trans:workingDiagnosis "myocardial infarction" ;
+
+    trans:reportedSymptoms "chest pains"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-03-19" ;
+
+    trans:workingDiagnosis "myocardial infarction" ;
+
+    trans:reportedSymptoms "myocardial infarction"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2005-05-16" ;
+
+    trans:workingDiagnosis "anxiety depression" ;
+
+    trans:reportedSymptoms "Depression"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-05-17" ;
+
+    trans:workingDiagnosis "myocardial infarction" ;
+
+    trans:reportedSymptoms "depression"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2005-05-18" ;
+
+    trans:workingDiagnosis "anxiety depression" ;
+
+    trans:reportedSymptoms "Depression"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2005-06-18" ;
+
+    trans:workingDiagnosis "anxiety depression" ;
+
+    trans:reportedSymptoms "Depression"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-07-20" ;
+
+    trans:workingDiagnosis "false" ;
+
+    trans:reportedSymptoms "false"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-15" ;
+
+    trans:workingDiagnosis "Dementia" ;
+
+    trans:reportedSymptoms "Confusion, Declining memory"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-20" ;
+
+    trans:workingDiagnosis "false" ;
+
+    trans:reportedSymptoms "false"
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_3-indivo.xml	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_3-indivo.xml	Tue Oct 05 05:31:13 2010 -0400
@@ -60,7 +60,7 @@
             <medication>
                <dateStarted>2005-07-09</dateStarted>
                <name type="http://indivo.org/codes/ndc"> 63856-223-40  </name>
-               <brandName/>
+               <genericName>CODEINE TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -83,7 +83,7 @@
             <medication>
                <dateStarted>2005-07-09</dateStarted>
                <name type="http://indivo.org/codes/ndc"> 0025-1525-31 </name>
-               <brandName/>
+               <genericName>CELECOXIB CAPSULES</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -106,7 +106,7 @@
             <medication>
                <dateStarted>2006-11-11</dateStarted>
                <name type="http://indivo.org/codes/ndc">  67618-106-60 </name>
-               <brandName/>
+               <genericName>DOCUSATE SODIUM CAPSULES</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -129,7 +129,7 @@
             <medication>
                <dateStarted>2007-11-09</dateStarted>
                <name type="http://indivo.org/codes/ndc"> 0054-8486-16 </name>
-               <brandName/>
+               <genericName>LACTULOSE</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -152,7 +152,7 @@
             <medication>
                <dateStarted>2007-11-09</dateStarted>
                <name type="http://indivo.org/codes/ndc"> 0179-0016-70 30  </name>
-               <brandName/>
+               <genericName>OMEPRAZOLE CAPSULES</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -175,7 +175,7 @@
             <medication>
                <dateStarted>2009-11-09</dateStarted>
                <name type="http://indivo.org/codes/ndc"> 0000</name>
-               <brandName/>
+               <genericName>DONEPEZIL HYDROCHLORIDE TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
--- a/syntheticPatients/AD_PCHR_3-tmo.trig	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_3-tmo.trig	Tue Oct 05 05:31:13 2010 -0400
@@ -2,6 +2,7 @@
   @prefix : <tag:[email protected]:2009/tmo/translator#> .
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
+  @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
   @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
 {
 _:patient  a trans:Patient ;
@@ -37,8 +38,50 @@
       
   . 
 
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2005-07-09" ; 
+
+    trans:genericName "CODEINE TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2005-07-09" ; 
+
+    trans:genericName "CELECOXIB CAPSULES" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2006-11-11" ; 
+
+    trans:genericName "DOCUSATE SODIUM CAPSULES" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2007-11-09" ; 
+
+    trans:genericName "LACTULOSE" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2007-11-09" ; 
+
+    trans:genericName "OMEPRAZOLE CAPSULES" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2009-11-09" ; 
+
+    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+  ] .
+
   _:patient trans:hasCondition [
-  trans:onset "2001-01-03T12:00:00"^^xsd:dateTime ;
+  trans:onset "2001-01-03T12:00:00" ;
 
   trans:diagnosedWith "Osteoarthrosis generalized involving hand" ;
 
@@ -47,7 +90,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2005-11-03T12:00:00"^^xsd:dateTime ;
+  trans:onset "2005-11-03T12:00:00" ;
 
   trans:diagnosedWith "Alzheimer's Disease" ;
 
@@ -56,7 +99,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2007-09-23T12:00:00"^^xsd:dateTime ;
+  trans:onset "2007-09-23T12:00:00" ;
 
   trans:diagnosedWith "Dyspepsia and other specified disorders of stomach" ;
 
@@ -64,51 +107,63 @@
   # unmatched diagnosedBy
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "1996-09-12"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "1996-09-12" ;
 
-    :reportedSymptoms "false"
-    
-  ] .
+    trans:workingDiagnosis "false" ;
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2002-07-15"^^xsd:dateTime ;
-
-    :reportedSymptoms "false"
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-11-05"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2002-07-15" ;
 
-    :reportedSymptoms "false"
+    trans:workingDiagnosis "false" ;
+
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2003-17-05"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-11-05" ;
 
-    :reportedSymptoms "Declining memory"
+    trans:workingDiagnosis "false" ;
+
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2005-12-05"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2003-17-05" ;
 
-    :reportedSymptoms "Declining memory"
+    trans:workingDiagnosis "Alzheimer's disease" ;
+
+    trans:reportedSymptoms "Declining memory"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2007-10-15"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2005-12-05" ;
 
-    :reportedSymptoms "false"
+    trans:workingDiagnosis "Alzheimer's disease" ;
+
+    trans:reportedSymptoms "Declining memory"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2007-10-15" ;
+
+    trans:workingDiagnosis "Alzheimer's disease" ;
+
+    trans:reportedSymptoms "false"
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_4-indivo.xml	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_4-indivo.xml	Tue Oct 05 05:31:13 2010 -0400
@@ -61,7 +61,7 @@
             <medication>
                <dateStarted>1989-05-15</dateStarted>
                <name type="http://indivo.org/codes/ndc">00179178370</name>
-               <brandName/>
+               <genericName>TEGRETOL TABLETS EXTENDED RELEASE</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -84,7 +84,7 @@
             <medication>
                <dateStarted>2009-08-20</dateStarted>
                <name type="http://indivo.org/codes/ndc">11071084201</name>
-               <brandName/>
+               <genericName>DONEPEZIL HYDROCHLORIDE TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -107,7 +107,7 @@
             <medication>
                <dateStarted>2009-05-20</dateStarted>
                <name type="http://indivo.org/codes/ndc">54569597500</name>
-               <brandName/>
+               <genericName>CARVEDILOL TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
--- a/syntheticPatients/AD_PCHR_4-tmo.trig	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_4-tmo.trig	Tue Oct 05 05:31:13 2010 -0400
@@ -2,6 +2,7 @@
   @prefix : <tag:[email protected]:2009/tmo/translator#> .
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
+  @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
   @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
 {
 _:patient  a trans:Patient ;
@@ -40,8 +41,29 @@
       
   . 
 
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "1989-05-15" ; 
+
+    trans:genericName "TEGRETOL TABLETS EXTENDED RELEASE" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2009-08-20" ; 
+
+    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2009-05-20" ; 
+
+    trans:genericName "CARVEDILOL TABLETS" ;    
+  ] .
+
   _:patient trans:hasCondition [
-  trans:onset "1950-05-15T12:00:00"^^xsd:dateTime ;
+  trans:onset "1950-05-15T12:00:00" ;
 
   trans:diagnosedWith "Epilepsy and recurrent seizures" ;
 
@@ -50,7 +72,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "1995-05-20T12:00:00"^^xsd:dateTime ;
+  trans:onset "1995-05-20T12:00:00" ;
 
   trans:diagnosedWith "Hypertension" ;
 
@@ -59,7 +81,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-05-20T12:00:00"^^xsd:dateTime ;
+  trans:onset "2009-05-20T12:00:00" ;
 
   trans:diagnosedWith "Alzheimer’s Dementia" ;
 
@@ -67,43 +89,53 @@
   # unmatched diagnosedBy
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2001-06-15"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2001-06-15" ;
 
-    :reportedSymptoms "false"
-    
-  ] .
+    trans:workingDiagnosis "epilepsy" ;
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2003-07-15"^^xsd:dateTime ;
-
-    :reportedSymptoms "Nausea"
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-01-20"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2003-07-15" ;
 
-    :reportedSymptoms "none"
+    trans:workingDiagnosis "Urea Metabolism Disorder" ;
+
+    trans:reportedSymptoms "Nausea"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-15"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-01-20" ;
 
-    :reportedSymptoms " Confusion, Declining memory "
+    trans:workingDiagnosis "none" ;
+
+    trans:reportedSymptoms "none"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-16"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-15" ;
 
-    :reportedSymptoms " Confusion, Declining memory "
+    trans:workingDiagnosis "Dementia" ;
+
+    trans:reportedSymptoms " Confusion, Declining memory "
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-16" ;
+
+    trans:workingDiagnosis "Dementia" ;
+
+    trans:reportedSymptoms " Confusion, Declining memory "
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_5-indivo.xml	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_5-indivo.xml	Tue Oct 05 05:31:13 2010 -0400
@@ -61,7 +61,7 @@
             <medication>
                <dateStarted>2008-02-03</dateStarted>
                <name type="http://indivo.org/codes/ndc">5456944671</name>
-               <brandName/>
+               <genericName>ATORVASTATIN TABLET</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -84,7 +84,7 @@
             <medication>
                <dateStarted>2008-05-06</dateStarted>
                <name type="http://indivo.org/codes/ndc">000007414020</name>
-               <brandName/>
+               <genericName>CARVEDILOL TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -107,7 +107,7 @@
             <medication>
                <dateStarted>2008-05-06</dateStarted>
                <name type="http://indivo.org/codes/ndc">6050502532</name>
-               <brandName/>
+               <genericName>CLOPIDOGREL TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -130,7 +130,7 @@
             <medication>
                <dateStarted>2009-06-18</dateStarted>
                <name type="http://indivo.org/codes/ndc">6050500652</name>
-               <brandName/>
+               <genericName>OMEPRAZOLE CAPSULES</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -154,7 +154,7 @@
                <dateStarted>2009-07-22</dateStarted>
                <dateStopped>2009-10-29</dateStopped>
                <name type="http://indivo.org/codes/ndc">0093732098</name>
-               <brandName/>
+               <genericName>DONEPEZIL HYDROCHLORIDE TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
--- a/syntheticPatients/AD_PCHR_5-tmo.trig	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_5-tmo.trig	Tue Oct 05 05:31:13 2010 -0400
@@ -2,6 +2,7 @@
   @prefix : <tag:[email protected]:2009/tmo/translator#> .
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
+  @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
   @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
 {
 _:patient  a trans:Patient ;
@@ -40,8 +41,45 @@
       
   . 
 
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2008-02-03" ; 
+
+    trans:genericName "ATORVASTATIN TABLET" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2008-05-06" ; 
+
+    trans:genericName "CARVEDILOL TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2008-05-06" ; 
+
+    trans:genericName "CLOPIDOGREL TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2009-06-18" ; 
+
+    trans:genericName "OMEPRAZOLE CAPSULES" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2009-07-22" ; 
+ 
+    trans:datePrescriptionEnded "2009-10-29" ;
+
+    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+  ] .
+
   _:patient trans:hasCondition [
-  trans:onset "2008-02-03T12:00:00"^^xsd:dateTime ;
+  trans:onset "2008-02-03T12:00:00" ;
 
   trans:diagnosedWith "hypertension" ;
 
@@ -50,7 +88,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-07-21T12:00:00"^^xsd:dateTime ;
+  trans:onset "2009-07-21T12:00:00" ;
 
   trans:diagnosedWith "alzheimer’s disease" ;
 
@@ -59,7 +97,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2008-05-06T12:00:00"^^xsd:dateTime ;
+  trans:onset "2008-05-06T12:00:00" ;
 
   trans:diagnosedWith "acute coronary occlusion without myocardial infarction" ;
 
@@ -68,7 +106,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-06-18T12:00:00"^^xsd:dateTime ;
+  trans:onset "2009-06-18T12:00:00" ;
 
   trans:diagnosedWith "gastroesophageal reflux disease" ;
 
@@ -77,7 +115,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-07-23T12:00:00"^^xsd:dateTime ;
+  trans:onset "2009-07-23T12:00:00" ;
 
   trans:diagnosedWith "nausea and vomiting" ;
 
@@ -86,7 +124,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-07-23T12:00:00"^^xsd:dateTime ;
+  trans:onset "2009-07-23T12:00:00" ;
 
   trans:diagnosedWith "adverse drug effect" ;
 
@@ -94,59 +132,73 @@
   # unmatched diagnosedBy
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2002-02-02"^^xsd:dateTime ;
-
-    :reportedSymptoms "false"
-    
-  ] .
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2002-02-02" ;
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-03-02"^^xsd:dateTime ;
+    trans:workingDiagnosis "false" ;
 
-    :reportedSymptoms "headache, somnolence"
-    
-  ] .
-
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-05-06"^^xsd:dateTime ;
-
-    :reportedSymptoms "chest pain, nausea, diaphoresis"
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-06-18"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-03-02" ;
 
-    :reportedSymptoms "dysphagia, nausea"
+    trans:workingDiagnosis "hypertension" ;
+
+    trans:reportedSymptoms "headache, somnolence"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-21"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-05-06" ;
 
-    :reportedSymptoms "memory loss"
+    trans:workingDiagnosis "acute coronary syndrome" ;
+
+    trans:reportedSymptoms "chest pain, nausea, diaphoresis"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-23"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-06-18" ;
 
-    :reportedSymptoms "nausea and vomiting"
+    trans:workingDiagnosis "gastroesophageal reflux disease" ;
+
+    trans:reportedSymptoms "dysphagia, nausea"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-30"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-21" ;
 
-    :reportedSymptoms ""
+    trans:workingDiagnosis "alzheimer's disease" ;
+
+    trans:reportedSymptoms "memory loss"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-23" ;
+
+    trans:workingDiagnosis "adverse drug effect" ;
+
+    trans:reportedSymptoms "nausea and vomiting"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-30" ;
+
+    trans:workingDiagnosis "referral for trial" ;
+
+    trans:reportedSymptoms ""
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_6-indivo.xml	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_6-indivo.xml	Tue Oct 05 05:31:13 2010 -0400
@@ -62,7 +62,7 @@
                <dateStarted>2009-07-20&gt;</dateStarted>
                <dateStopped>2009-11-16</dateStopped>
                <name type="http://indivo.org/codes/ndc">11071084101</name>
-               <brandName/>
+               <genericName>DONEPEZIL HYDROCHLORIDE TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
@@ -85,7 +85,7 @@
             <medication>
                <dateStarted>2009-11-09</dateStarted>
                <name type="http://indivo.org/codes/ndc">00069-1520-68</name>
-               <brandName/>
+               <genericName>AMLODIPINE TABLETS</genericName>
                <dose>
                   <value>999</value>
                   <unit type="http://indivo.org/codes/units#" value="999"/>
--- a/syntheticPatients/AD_PCHR_6-tmo.trig	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_6-tmo.trig	Tue Oct 05 05:31:13 2010 -0400
@@ -2,6 +2,7 @@
   @prefix : <tag:[email protected]:2009/tmo/translator#> .
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
+  @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
   @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
 {
 _:patient  a trans:Patient ;
@@ -40,8 +41,24 @@
       
   . 
 
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2009-07-20>" ; 
+ 
+    trans:datePrescriptionEnded "2009-11-16" ;
+
+    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+  ] .
+
+  [ a trans:Prescription ;
+    trans:prescribedTo _:patient ;
+    indivo:prescribedOn "2009-11-09" ; 
+
+    trans:genericName "AMLODIPINE TABLETS" ;    
+  ] .
+
   _:patient trans:hasCondition [
-  trans:onset "2008-11-09T12:00:00"^^xsd:dateTime ;
+  trans:onset "2008-11-09T12:00:00" ;
 
   trans:diagnosedWith "Hypertension" ;
 
@@ -50,7 +67,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-11-09T12:00:00"^^xsd:dateTime ;
+  trans:onset "2009-11-09T12:00:00" ;
 
   trans:diagnosedWith "Hypocalcemia" ;
 
@@ -58,51 +75,65 @@
   # unmatched diagnosedBy
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-05-10"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-05-10" ;
 
-    :reportedSymptoms "false"
-    
-  ] .
+    trans:workingDiagnosis "false" ;
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-15"^^xsd:dateTime ;
-
-    :reportedSymptoms "Confusion, Declining memory"
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-07-20"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-15" ;
 
-    :reportedSymptoms "false"
+    trans:workingDiagnosis "Dementia" ;
+
+    trans:reportedSymptoms "Confusion, Declining memory"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-09-15"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-07-20" ;
 
-    :reportedSymptoms "Depression, gait problems"
+    trans:workingDiagnosis "Dementia" ;
+
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-11-09"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-09-15" ;
 
-    :reportedSymptoms "Depression"
+    trans:workingDiagnosis "Major Depression" ;
+
+    trans:workingDiagnosis "Abnormal gait" ;
+
+    trans:reportedSymptoms "Depression, gait problems"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-11-16"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-11-09" ;
 
-    :reportedSymptoms "none"
+    trans:workingDiagnosis "Major Depression" ;
+
+    trans:reportedSymptoms "Depression"
+    
+  ] .
+
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-11-16" ;
+
+    trans:workingDiagnosis "referral to endocrinologist" ;
+
+    trans:reportedSymptoms "none"
     
   ] .
 
--- a/syntheticPatients/AD_PCHR_7-tmo.trig	Tue Oct 05 05:30:01 2010 -0400
+++ b/syntheticPatients/AD_PCHR_7-tmo.trig	Tue Oct 05 05:31:13 2010 -0400
@@ -2,6 +2,7 @@
   @prefix : <tag:[email protected]:2009/tmo/translator#> .
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
+  @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
   @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
 {
 _:patient  a trans:Patient ;
@@ -41,7 +42,7 @@
   . 
 
   _:patient trans:hasCondition [
-  trans:onset "1978-01-31T12:00:00"^^xsd:dateTime ;
+  trans:onset "1978-01-31T12:00:00" ;
 
   trans:diagnosedWith "Down Syndrome" ;
 
@@ -50,7 +51,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-02-01T12:00:00"^^xsd:dateTime ;
+  trans:onset "2009-02-01T12:00:00" ;
 
   trans:diagnosedWith "Alzheimer’s Disease" ;
 
@@ -58,35 +59,43 @@
   # unmatched diagnosedBy
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2008-11-15"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2008-11-15" ;
 
-    :reportedSymptoms "true"
+    trans:workingDiagnosis "true" ;
+
+    trans:reportedSymptoms "true"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-01-15"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-01-15" ;
 
-    :reportedSymptoms "Confusion, Becomes lost"
+    trans:workingDiagnosis "Dementia" ;
+
+    trans:reportedSymptoms "Confusion, Becomes lost"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-01-20"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-01-20" ;
 
-    :reportedSymptoms "false"
+    trans:workingDiagnosis "Dementia" ;
+
+    trans:reportedSymptoms "false"
     
   ] .
 
-  [ a :Encounter ;
-    :patient _:patient ;
-    :dateOfEncounter "2009-01-30"^^xsd:dateTime ;
+  [ a trans:Encounter ;
+    trans:patient _:patient ;
+    trans:dateOfEncounter "2009-01-30" ;
 
-    :reportedSymptoms "false"
+    trans:workingDiagnosis "Alzheimers Disease" ;
+
+    trans:reportedSymptoms "false"
     
   ] .