From a46b5d390fca63adb2a9327e774e8cb8bf3a7000 Mon Sep 17 00:00:00 2001
From: Vrinda <vrinda.nayak@j4care.com>
Date: Tue, 17 Dec 2024 16:35:49 +0100
Subject: [PATCH] Fix #4630 : Outgoing HL7 notification fails for empty Patient
 Address value sent in incoming PID.11 just with component limiters

---
 .../src/main/resources/hl7-common-outgoing.xsl      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dcm4chee-arc-conf-data/src/main/resources/hl7-common-outgoing.xsl b/dcm4chee-arc-conf-data/src/main/resources/hl7-common-outgoing.xsl
index 063ed7f1c1..a017f71afe 100644
--- a/dcm4chee-arc-conf-data/src/main/resources/hl7-common-outgoing.xsl
+++ b/dcm4chee-arc-conf-data/src/main/resources/hl7-common-outgoing.xsl
@@ -212,9 +212,16 @@
                 <xsl:choose>
                     <xsl:when test="starts-with($addrComp, '^')">
                         <component/>
-                        <xsl:call-template name="addressComp">
-                            <xsl:with-param name="addrComp" select="substring-after($addrComp, '^')"/>
-                        </xsl:call-template>
+                        <xsl:choose>
+                            <xsl:when test="string-length($addrComp) > 1">
+                                <xsl:call-template name="addressComp">
+                                    <xsl:with-param name="addrComp" select="substring-after($addrComp, '^')"/>
+                                </xsl:call-template>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <component/>
+                            </xsl:otherwise>
+                        </xsl:choose>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:variable name="comp" select="substring-before($addrComp, '^')"/>