These changes are to add the sdtc:raceCode to the CCDA 2.1 patient.

README.md

@@ -0,0 +1,3 @@
+To generate:
+
+mvn clean install

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>org.connectopensource</groupId>
     <artifactId>CONNECTCommonTypesLib</artifactId>
-    <version>5.4.0-SNAPSHOT</version>
+    <version>5.4.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,8 +45,8 @@
     </distributionManagement>
 
     <properties>
-        <compiler.source>1.7</compiler.source>
-        <compiler.target>1.7</compiler.target>
+        <compiler.source>1.8</compiler.source>
+        <compiler.target>1.8</compiler.target>
     </properties>
 
     <build>
@@ -70,7 +70,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
+                <version>0.15.1</version>
                 <configuration>
                     <generateDirectory>${project.build.directory}/generated-sources/</generateDirectory>
                     <bindingDirectory>${basedir}/src/main/resources/schemas/</bindingDirectory>

src/main/resources/schemas/HL7V3/NE2008/coreschemas/SDTC.xsd

@@ -21,8 +21,13 @@
   •	code/@valueSet
   •	code/@valueSetVersion
 -->
-<xs:schema targetNamespace="urn:hl7-org:sdtc" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:hl7-org:sdtc" elementFormDefault="qualified"
-  xmlns:hl7="urn:hl7-org:v3">
+<xs:schema targetNamespace="urn:hl7-org:sdtc" 
+           xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns="urn:hl7-org:sdtc" elementFormDefault="qualified"
+           xmlns:hl7="urn:hl7-org:v3" 
+           xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+           xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+           jaxb:version="1.0" jaxb:extensionBindingPrefixes="xjc">
   <xs:annotation>
     <xs:documentation>SDTC Schema Extensions, July 2012</xs:documentation>
 
@@ -32,16 +37,34 @@
   <xs:attribute name="valueSet" type="hl7:oid"/>
   <xs:attribute name="valueSetVersion" type="hl7:st"/>
 
-<!--  <xs:element name="raceCode" type="hl7:CE"/> -->
+  <!-- 
+       When enabling the stdc raceCode, we need to account for a name collision 
+       with the existing (and still required) org.hl7.v3.raceCode as found in
+       POCD_MT000040.Patient. So, we add the reference in the POCD_MT000040.xsd
+       file but include an annotation directive here to change the java property
+       name to sdtcRaceCode.
+  -->
+  <xs:element name="raceCode" type="hl7:CE">     
+      <xs:annotation>          
+          <xs:appinfo>
+              <jaxb:property name="sdtcRaceCode"/>
+          </xs:appinfo>              
+      </xs:annotation>
+  </xs:element> 
 
   <xs:element name="dischargeDispositionCode" type="hl7:CE"/>
 
   <xs:element name="id" type="hl7:II"/>
+
+  <xs:element name="birthTime" type="hl7:TS"/>
 
   <xs:element name="deceasedInd" type="hl7:BL"/>
   <xs:element name="deceasedTime" type="hl7:TS"/>
-
-  <xs:element name="birthTime" type="hl7:TS"/>
-
+
+  <xs:element name="multipleBirthInd" type="hl7:BL"/>
+  <xs:element name="multipleBirthOrderNumber" type="hl7:INT"/>
+
+  <!-- this is needed for USCDIv3, in the POCD_MT000040.Performer2 type of the POCD_MT000040.xsl file -->
+  <xs:element name="functionCode" type="hl7:CE"/>
 
 </xs:schema>

src/main/resources/schemas/HL7V3/NE2008/coreschemas/datatypes-base.xsd

@@ -1281,6 +1281,7 @@ Generated by $Id: datatypes-base.xsd,v 1.1 2007/03/20 02:42:09 wbeeler Exp $</xs
                   </xs:documentation>
 					</xs:annotation>
 				</xs:attribute>
+
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
@@ -2036,6 +2037,18 @@ Generated by $Id: datatypes-base.xsd,v 1.1 2007/03/20 02:42:09 wbeeler Exp $</xs
 				</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
+
+                <xs:attribute name="nullFlavor" type="NullFlavor" use="optional">
+                        <xs:annotation>
+                                <xs:documentation> is a set of codes each of which specifies
+				   a certain subcategory of the name part in addition to
+                         the main name part type. For example, a given name may
+                         be flagged as a nickname, a family name may be a
+                         pseudonym or a name of public records.
+                                </xs:documentation>
+                        </xs:annotation>
+                </xs:attribute>
+
 	</xs:complexType>
 	<xs:complexType name="en_explicit.delimiter" mixed="true">
 		<xs:complexContent mixed="true">
@@ -2058,6 +2071,7 @@ Generated by $Id: datatypes-base.xsd,v 1.1 2007/03/20 02:42:09 wbeeler Exp $</xs
 			<xs:restriction base="ENXP_explicit">
 				<xs:attribute name="partType" type="EntityNamePartType" fixed="GIV"/>
 				<xs:attribute name="qualifier" type="set_EntityNamePartQualifier" use="optional"/>
+				<xs:attribute name="nullFlavor" type="NullFlavor" use="optional"/>
 			</xs:restriction>
 		</xs:complexContent>
 	</xs:complexType>

src/main/resources/schemas/HL7V3/NE2008/coreschemas/voc.xsd

@@ -17599,6 +17599,9 @@ RoseTree XML to Schema: $Id: VocabXMLtoXSD.xsl,v 1.8 2007/03/20 02:48:50 wbeeler
 			<xs:enumeration value="CON"/>
 			<xs:enumeration value="ECON"/>
 			<xs:enumeration value="NOK"/>
+                        <xs:enumeration value="GUARD"/>
+                        <xs:enumeration value="EMP"/>
+
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="RoleClassCoveredParty">

src/main/resources/schemas/HL7V3/NE2008/multicacheschemas/POCD_MT000040.xsd

@@ -949,9 +949,18 @@ StaticMifToXsd.xsl version 2.0</xs:documentation>
 			<xs:element name="name" type="PN_explicit" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="administrativeGenderCode" type="CE" minOccurs="0"/>
 			<xs:element name="birthTime" type="TS_explicit" minOccurs="0"/>
+			<!-- Begin Extension: (SDTC) for eICR 3.1 -->
+			<xs:element ref="sdtc:deceasedInd" type="BL" minOccurs="0"/>
+			<xs:element ref="sdtc:deceasedTime" type="TS" minOccurs="0"/>
+			<xs:element ref="sdtc:multipleBirthInd" type="BL" minOccurs="0"/>
+			<xs:element ref="sdtc:multipleBirthOrderNumber" type="INT" minOccurs="0"/>
+			<!-- End Extension: (SDTC) -->
 			<xs:element name="maritalStatusCode" type="CE" minOccurs="0"/>
 			<xs:element name="religiousAffiliationCode" type="CE" minOccurs="0"/>
 			<xs:element name="raceCode" type="CE" minOccurs="0"/>
+            <!-- Begin Extension: (SDTC) -->
+            <xs:element ref="sdtc:raceCode" minOccurs="0" maxOccurs="unbounded"/>
+            <!-- End Extension: (SDTC) -->
 			<xs:element name="ethnicGroupCode" type="CE" minOccurs="0"/>
 			<xs:element name="guardian" type="POCD_MT000040.Guardian" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="birthplace" type="POCD_MT000040.Birthplace" minOccurs="0"/>
@@ -992,6 +1001,8 @@ StaticMifToXsd.xsl version 2.0</xs:documentation>
 			<xs:element name="realmCode" type="CS" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="typeId" type="POCD_MT000040.InfrastructureRoot.typeId" minOccurs="0"/>
 			<xs:element name="templateId" type="II" minOccurs="0" maxOccurs="unbounded"/>
+			<!-- add sdtc:functionCode. needed by USCDIv3 -->
+			<xs:element ref="sdtc:functionCode" type="CE" minOccurs="0"/>
 			<xs:element name="time" type="IVL_TS_explicit" minOccurs="0"/>
 			<xs:element name="modeCode" type="CE" minOccurs="0"/>
 			<xs:element name="assignedEntity" type="POCD_MT000040.AssignedEntity"/>