Commit aa029376 authored by R.W.Majeed's avatar R.W.Majeed

Merge branch 'master' of gitlab.uni-oldenburg.de:AKTIN/dwh-import

schematron runtime dependency changed to last working state with two templates
# Conflicts:
#	cda-validation/pom.xml
parents 16c16627 68951dc5
......@@ -1041,12 +1041,11 @@
<xsl:template name="templateGetConceptValue">
<xsl:attribute name="concept">
<xsl:choose>
<xsl:when test="../cda:value/@codeSystem='2.16.840.1.113883.6.1'"><xsl:value-of select="$LOINC-Prefix"/></xsl:when> <!-- not used -->
<xsl:when test="../cda:value/@codeSystem='1.2.276.0.76.5.439'"><xsl:value-of select="$CEDIS-Prefix"/></xsl:when>
<xsl:when test="../cda:code/@code='75322-8'"><xsl:value-of select="$CEDIS-Prefix"/></xsl:when>
<xsl:when test="../cda:code/@code='11459-5'"><xsl:value-of select="$Transport-Prefix"/></xsl:when>
<xsl:when test="../cda:code/@code='RPPL'"><xsl:value-of select="$AKTIN-Prefix"/>RPPL:</xsl:when>
<xsl:when test="../cda:code/@code='SPPL'"><xsl:value-of select="$AKTIN-Prefix"/>SPPL:</xsl:when>
<xsl:when test="../cda:value/@codeSystem='2.16.840.1.113883.6.3' and ../cda:code/@code='DX'"><xsl:value-of select="$ICD10GM-Prefix"/></xsl:when> <!-- Abschlussdiagnosen --> <!-- not used -->
<xsl:otherwise><xsl:value-of select="../cda:code/@code"/>:</xsl:otherwise> <!-- Default Prefix code/code -->
</xsl:choose>
<xsl:choose>
......
......@@ -1015,13 +1015,12 @@
<xsl:template name="templateGetConceptValue">
<xsl:attribute name="concept">
<xsl:choose>
<xsl:when test="../cda:value/@codeSystem='2.16.840.1.113883.6.1'"><xsl:value-of select="$LOINC-Prefix"/></xsl:when> <!-- not used -->
<xsl:choose>
<xsl:when test="../cda:value/@codeSystem='1.2.276.0.76.5.439'"><xsl:value-of select="$CEDIS-Prefix"/></xsl:when>
<xsl:when test="../cda:code/@code='75322-8'"><xsl:value-of select="$CEDIS-Prefix"/></xsl:when>
<xsl:when test="../cda:code/@code='11459-5'"><xsl:value-of select="$Transport-Prefix"/></xsl:when>
<xsl:when test="../cda:code/@code='RPPL'"><xsl:value-of select="$AKTIN-Prefix"/>RPPL:</xsl:when>
<xsl:when test="../cda:code/@code='SPPL'"><xsl:value-of select="$AKTIN-Prefix"/>SPPL:</xsl:when>
<xsl:when test="../cda:value/@codeSystem='2.16.840.1.113883.6.3' and ../cda:code/@code='DX'"><xsl:value-of select="$ICD10GM-Prefix"/></xsl:when> <!-- Abschlussdiagnosen --> <!-- not used -->
<xsl:otherwise><xsl:value-of select="../cda:code/@code"/>:</xsl:otherwise> <!-- Default Prefix code/code -->
</xsl:choose>
<xsl:choose>
......
......@@ -14,7 +14,6 @@
<properties>
<schematronVersion>20170302T140447</schematronVersion>
<examplesVersion>20170105T160149</examplesVersion>
<schematronArchive>aktin-runtime-${schematronVersion}</schematronArchive>
<examplesArchive>aktin-xml-${examplesVersion}</examplesArchive>
</properties>
......
......@@ -95,7 +95,7 @@
<participant typeCode="HLD">
<templateId root="1.2.276.0.76.10.2022"/>
<associatedEntity classCode="POLHOLD">
<code code="SELF" codeSystem="2.16.840.1.113883.1.11.18877"/>
<code code="SELF" codeSystem="2.16.840.1.113883.5.111" displayName="self"/>
<scopingOrganization>
<!-- IK-NR -->
<id extension="987654321" root="1.2.276.0.76.4.5"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment