From 25ebdf1482f2bcddacef210af3c7cf25a7e252fc Mon Sep 17 00:00:00 2001
From: MMWagner <mmw1@pitt.edu>
Date: Thu, 1 Dec 2016 10:52:25 -0500
Subject: [PATCH] Fixed bugs 2150 and 2151

---
 src/main/resources/apollo_types_4.0.xsd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/apollo_types_4.0.xsd b/src/main/resources/apollo_types_4.0.xsd
index 0e6283a..8de463d 100644
--- a/src/main/resources/apollo_types_4.0.xsd
+++ b/src/main/resources/apollo_types_4.0.xsd
@@ -274,7 +274,7 @@
 
   <complexType name="Interval">
     <sequence>
-			<element name="startBoundaryDefinition" type="tns:Interval"
+			<element name="startBoundaryDefinition" type="tns:IntervalBoundaryDefinitionEnum"
                maxOccurs="1" minOccurs="1">
       </element>
       <element name="endBoundaryDefinition" type="tns:IntervalBoundaryDefinitionEnum"
@@ -751,7 +751,7 @@
 
 
   <!-- 8. INFECTION AND INFECTIOUS DISEASE -->
-  <!-- -->
+  <!-- N.B.  Move three 'l' forms (infection, contamination, infectious disease) to an 'under developent section' before release-->
 
   <complexType name="lInfection">
     <complexContent>
@@ -813,7 +813,7 @@
 
     <complexType name="lInfectiousDisease">
         <complexContent>
-            <extension base="tns:ApolloIndexableItem">
+            <extension base="tns:InfectiousDisease">
                 <sequence>
                     <element name="coosalPathogen" type="tns:ApolloPathogenCode"
                              maxOccurs="1" minOccurs="1" />
@@ -826,7 +826,7 @@
 
     <complexType name="InfectiousDisease">
         <complexContent>
-            <extension base="tns:lInfectiousDisease">
+            <extension base="tns:ApolloIndexableItem">
         <sequence>
           <element name="disease" type="tns:SnomedId" maxOccurs="1"
                    minOccurs="1" />
@@ -930,7 +930,7 @@
 		types'- -->
   <complexType name="lContamination">
     <complexContent>
-      <extension base="tns:ApolloIndexableItem">
+      <extension base="tns:Contamination">
         <sequence>
           <element name="XXX" type="tns:ApolloPathogenCode"
                    maxOccurs="1" minOccurs="1" />
@@ -942,7 +942,7 @@
 
   <complexType name="Contamination">
     <complexContent>
-      <extension base="tns:lContamination">
+      <extension base="tns:ApolloIndexableItem">
         <sequence>
           <element name="pathogen" type="tns:ApolloPathogenCode"
                    maxOccurs="1" minOccurs="1" />