From 1e626f38d9c029ef5b532880a7aa58ac9a40bdfc Mon Sep 17 00:00:00 2001
From: Vrinda <vrinda.nayak@j4care.com>
Date: Mon, 29 Jul 2024 11:51:46 +0200
Subject: [PATCH] HL7 Order to MWL - ORM^O01 : Modality and Scheduled Procedure
 Step ID values not transformed correctly by XSL #4538

---
 dcm4chee-arc-conf-data/src/main/resources/hl7-order2dcm.xsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dcm4chee-arc-conf-data/src/main/resources/hl7-order2dcm.xsl b/dcm4chee-arc-conf-data/src/main/resources/hl7-order2dcm.xsl
index 143a6bc2f5..e86ff6dfbb 100644
--- a/dcm4chee-arc-conf-data/src/main/resources/hl7-order2dcm.xsl
+++ b/dcm4chee-arc-conf-data/src/main/resources/hl7-order2dcm.xsl
@@ -44,6 +44,7 @@
         <xsl:with-param name="spsStatus" select="$spsStatus"/>
         <xsl:with-param name="spsStartDateTime" select="$spsStartDateTime"/>
         <xsl:with-param name="spsScheduledPhysician" select="$spsScheduledPhysician"/>
+        <xsl:with-param name="obr" select="OBR[1]"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="OBX"/>
       <!-- Admission ID, Issuer -->
@@ -385,6 +386,7 @@
     <xsl:param name="spsStatus"/>
     <xsl:param name="spsStartDateTime"/>
     <xsl:param name="spsScheduledPhysician"/>
+    <xsl:param name="obr"/>
     <!-- Study Instance UID -->
     <xsl:call-template name="attr">
       <xsl:with-param name="tag" select="'0020000D'"/>
@@ -427,13 +429,13 @@
         <xsl:call-template name="attr">
           <xsl:with-param name="tag" select="'00080060'"/>
           <xsl:with-param name="vr" select="'CS'"/>
-          <xsl:with-param name="val" select="OBR/field[24]/text()"/>
+          <xsl:with-param name="val" select="$obr/field[24]"/>
         </xsl:call-template>
         <!-- Scheduled Procedure Step ID -->
         <xsl:call-template name="attr">
           <xsl:with-param name="tag" select="'00400009'"/>
           <xsl:with-param name="vr" select="'SH'"/>
-          <xsl:with-param name="val" select="OBR/field[20]/text()"/>
+          <xsl:with-param name="val" select="$obr/field[20]"/>
         </xsl:call-template>
         <!-- Scheduled Station AE Title -->
         <xsl:call-template name="attr">