From: gunter z. <gun...@us...> - 2005-10-27 13:30:30
|
Update of /cvsroot/dcm4che/dcm4jboss-hl7/src/etc/conf/xsl/hl7 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25091/src/etc/conf/xsl/hl7 Modified Files: mpps2orm.xsl Log Message: FIX missing Order Status (ORC-5) Index: mpps2orm.xsl =================================================================== RCS file: /cvsroot/dcm4che/dcm4jboss-hl7/src/etc/conf/xsl/hl7/mpps2orm.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mpps2orm.xsl 12 Oct 2005 15:14:41 -0000 1.1 --- mpps2orm.xsl 27 Oct 2005 13:30:21 -0000 1.2 *************** *** 30,47 **** <field/> <field/> ! <field><xsl:value-of select="attr[@tag='00100020']"/> <component/> <component/> ! <component><xsl:value-of select="attr[@tag='00100021']"/></component> </field> <field/> <field> <xsl:call-template name="pn2xpn"> ! <xsl:with-param name="pn" select="attr[@tag='00100010']"/> </xsl:call-template> </field> <field/> ! <field><xsl:value-of select="attr[@tag='00100030']"/></field> ! <field><xsl:value-of select="attr[@tag='00100040']"/></field> </PID> <xsl:apply-templates select="attr[@tag='00400270']/item"/> --- 30,47 ---- <field/> <field/> ! <field><xsl:value-of select="normalize-space(attr[@tag='00100020'])"/> <component/> <component/> ! <component><xsl:value-of select="normalize-space(attr[@tag='00100021'])"/></component> </field> <field/> <field> <xsl:call-template name="pn2xpn"> ! <xsl:with-param name="pn" select="normalize-space(attr[@tag='00100010'])"/> </xsl:call-template> </field> <field/> ! <field><xsl:value-of select="normalize-space(attr[@tag='00100030'])"/></field> ! <field><xsl:value-of select="normalize-space(attr[@tag='00100040'])"/></field> </PID> <xsl:apply-templates select="attr[@tag='00400270']/item"/> *************** *** 50,54 **** <xsl:template match="item"> ! <xsl:variable name="accno" select="attr[@tag='00080050']"/> <OBC> <field>SC</field> --- 50,54 ---- <xsl:template match="item"> ! <xsl:variable name="accno" select="normalize-space(attr[@tag='00080050'])"/> <OBC> <field>SC</field> *************** *** 61,65 **** <field> <xsl:call-template name="ppsstatus2orderstatus"> ! <xsl:with-param name="ppsstatus" select="../../attr[@tag='00400252']"/> </xsl:call-template> </field> --- 61,65 ---- <field> <xsl:call-template name="ppsstatus2orderstatus"> ! <xsl:with-param name="ppsstatus" select="normalize-space(../../attr[@tag='00400252'])"/> </xsl:call-template> </field> *************** *** 78,82 **** </OBR> <ZDS> ! <field><xsl:value-of select="attr[@tag='0020000D']"/> <component><xsl:value-of select="$SendingApplication"/></component> <component>Application</component> --- 78,82 ---- </OBR> <ZDS> ! <field><xsl:value-of select="normalize-space(attr[@tag='0020000D'])"/> <component><xsl:value-of select="$SendingApplication"/></component> <component>Application</component> *************** *** 114,120 **** <xsl:param name="ppsstatus"/> <xsl:choose> ! <xsl:when test="$ppsstatus='COMPLETED'">CM</xsl:when> ! <xsl:when test="$ppsstatus='DISCONTINUED'">DC</xsl:when> ! <xsl:when test="$ppsstatus='IN PROGRESS'">IP</xsl:when> </xsl:choose> </xsl:template> --- 114,120 ---- <xsl:param name="ppsstatus"/> <xsl:choose> ! <xsl:when test="$ppsstatus = 'COMPLETED'">CM</xsl:when> ! <xsl:when test="$ppsstatus = 'DISCONTINUED'">DC</xsl:when> ! <xsl:when test="$ppsstatus = 'IN PROGRESS'">IP</xsl:when> </xsl:choose> </xsl:template> *************** *** 123,132 **** <xsl:template name="code2ce"> <xsl:param name="code"/> ! <xsl:value-of select="$code/attr[@tag='00080100']"/> <component> ! <xsl:value-of select="$code/attr[@tag='00080104']"/> </component> <component> ! <xsl:value-of select="$code/attr[@tag='00080102']"/> </component> </xsl:template> --- 123,132 ---- <xsl:template name="code2ce"> <xsl:param name="code"/> ! <xsl:value-of select="normalize-space($code/attr[@tag='00080100'])"/> <component> ! <xsl:value-of select="normalize-space($code/attr[@tag='00080104'])"/> </component> <component> ! <xsl:value-of select="normalize-space($code/attr[@tag='00080102'])"/> </component> </xsl:template> |