Merge remote-tracking branch 'origin/master'

ada_2_fhir/zibs2017/payload/zib-problem-2.1.xsl

@@ -45,7 +45,7 @@ The full text of the license is available at http://www.gnu.org/copyleft/lesser.
                 </reference-display>
                 <xsl:apply-templates select="current-group()[1]" mode="doProblemEntry-2.1">
                     <xsl:with-param name="uuid" select="$uuid"/>
-                    <xsl:with-param name="searchMode">match</xsl:with-param>
+                    <xsl:with-param name="searchMode">include</xsl:with-param>
                 </xsl:apply-templates>
             </unieke-problem>
         </xsl:for-each-group>

ada_2_hl7/hl7/2_hl7_hl7_include.xsl

@@ -18,7 +18,7 @@ The full text of the license is available at http://www.gnu.org/copyleft/lesser.
     <xsl:import href="../../util/datetime.xsl"/>
     <xsl:import href="../../util/utilities.xsl"/>
     <xsl:import href="../../util/units.xsl"/>
-    
+
     <!-- only give dateT a value if you want conversion of relative T dates -->
     <xsl:param name="dateT" as="xs:date?"/>
     <xd:doc scope="stylesheet">
@@ -871,6 +871,11 @@ The full text of the license is available at http://www.gnu.org/copyleft/lesser.
                 <xsl:attribute name="xsi:type" select="$xsiType"/>
             </xsl:if>
             <xsl:choose>
+                <xsl:when test="$root = $oidHL7NullFlavor">
+                    <xsl:attribute name="nullFlavor">
+                        <xsl:value-of select="@value"/>
+                    </xsl:attribute>
+                </xsl:when>
                 <!-- extension + root ... the regular case -->
                 <xsl:when test="string-length($root) gt 0 and string-length(@value) gt 0">
                     <xsl:attribute name="extension">
@@ -1167,8 +1172,8 @@ The full text of the license is available at http://www.gnu.org/copyleft/lesser.
         <xsl:param name="elemName" as="xs:string">value</xsl:param>
         <xsl:param name="urlSchemeCode" as="xs:string?"/>
         <xsl:param name="use" as="xs:string*"/>
-        <xsl:param name="xsiType" as="xs:string?">TEL</xsl:param>        
-      
+        <xsl:param name="xsiType" as="xs:string?">TEL</xsl:param>
+
         <xsl:for-each select="$in">
             <!-- spaces are not allowed in URL scheme -->
             <xsl:variable name="theValue" select="translate(@value, ' ', '')"/>
@@ -1186,7 +1191,7 @@ The full text of the license is available at http://www.gnu.org/copyleft/lesser.
                             <xsl:value-of select="$theValue"/>
                         </xsl:when>
                         <xsl:when test="string-length($urlSchemeCode) gt 0">
-                            <xsl:value-of select="concat($urlSchemeCode, ':', $theValue)"/>                            
+                            <xsl:value-of select="concat($urlSchemeCode, ':', $theValue)"/>
                         </xsl:when>
                         <xsl:when test="matches($theValue, '.+@[^\.]+\.')">
                             <!-- email -->
@@ -1195,7 +1200,7 @@ The full text of the license is available at http://www.gnu.org/copyleft/lesser.
                         <xsl:when test="matches($theValue, '^[\d\s\(\)+-]+$')">
                             <!-- fax or tel number, but without $urlSchemeCode we have no way of knowing, 
                                 so we default to tel, since fax really is also a telephone number technically -->
-                            <xsl:value-of select="concat('tel:', $theValue)"/>                            
+                            <xsl:value-of select="concat('tel:', $theValue)"/>
                         </xsl:when>
                         <xsl:otherwise>
                             <!-- hmmm, should not happen, so log a message, but let's still output the input -->
@@ -1271,6 +1276,7 @@ The full text of the license is available at http://www.gnu.org/copyleft/lesser.
         <xd:param name="elemName">The hl7 element name to be outputted. Defaults to value.</xd:param>
         <xd:param name="elemNamespace">The namespace this element is in. Defaults to the hl7 namespace.</xd:param>
         <xd:param name="inputNullFlavor">nullFlavor string if applicable</xd:param>
+        <xd:param name="precision">Determines the picture of the date(time) format. Second is the default.</xd:param>
     </xd:doc>
     <xsl:template name="makeTSValue" match="element()" mode="MakeTSValue">
         <xsl:param name="inputValue" as="xs:string?" select="@value"/>
@@ -1280,13 +1286,16 @@ The full text of the license is available at http://www.gnu.org/copyleft/lesser.
         <xsl:param name="elemName">value</xsl:param>
         <xsl:param name="elemNamespace">urn:hl7-org:v3</xsl:param>
         <xsl:param name="inputNullFlavor" select="@nullFlavor" as="xs:string?"/>
+        <xsl:param name="precision" as="xs:string?">second</xsl:param>
+
         <xsl:element name="{$elemName}" namespace="{$elemNamespace}">
             <xsl:if test="string-length($xsiType) gt 0">
                 <xsl:attribute name="xsi:type" select="$xsiType"/>
             </xsl:if>
             <xsl:call-template name="makeTSValueAttr">
                 <xsl:with-param name="inputValue" select="$inputValue"/>
                 <xsl:with-param name="inputNullFlavor" select="$inputNullFlavor"/>
+                <xsl:with-param name="precision" select="$precision"/>
             </xsl:call-template>
         </xsl:element>
     </xsl:template>