From 87afa8a6dedfa797db94022fddff340a5e7e61ee Mon Sep 17 00:00:00 2001
From: Vrinda <vrinda.nayak@j4care.com>
Date: Fri, 28 Jul 2023 19:11:51 +0200
Subject: [PATCH] HL7 order messages to MWL / HL7 ORU messages to DICOM SRs,
 PDFs : Enable mapping of PV1.8 to Referring Physician Identification Sequence
 (0008,0096) fields #4157

---
 .../src/main/resources/hl7-common.xsl         | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/dcm4chee-arc-conf-data/src/main/resources/hl7-common.xsl b/dcm4chee-arc-conf-data/src/main/resources/hl7-common.xsl
index bb1a6f9a9b..68238fc8b2 100644
--- a/dcm4chee-arc-conf-data/src/main/resources/hl7-common.xsl
+++ b/dcm4chee-arc-conf-data/src/main/resources/hl7-common.xsl
@@ -773,8 +773,7 @@
       <xsl:with-param name="val" select="string(field[2]/text())"/>
     </xsl:call-template>
     <!-- Referring Physician Name -->
-    <xsl:call-template name="cn2pnAttr">
-      <xsl:with-param name="tag" select="'00080090'"/>
+    <xsl:call-template name="referringPhysician">
       <xsl:with-param name="cn" select="field[8]"/>
     </xsl:call-template>
     <xsl:call-template name="attr">
@@ -788,6 +787,32 @@
     </xsl:call-template>
   </xsl:template>
 
+  <xsl:template name="referringPhysician">
+    <xsl:param name="cn"/>
+    <!-- Referring Physician Name -->
+    <xsl:call-template name="cn2pnAttr">
+      <xsl:with-param name="tag" select="'00080090'"/>
+      <xsl:with-param name="cn" select="$cn"/>
+    </xsl:call-template>
+    <!-- Referring Physician identification Sequence -->
+    <xsl:variable name="id" select="$cn/text()"/>
+    <xsl:if test="$id">
+      <DicomAttribute tag="00080096" vr="SQ">
+        <Item number="1">
+          <DicomAttribute tag="00401101" vr="SQ">
+            <Item number="1">
+              <xsl:call-template name="attr">
+                <xsl:with-param name="tag" select="'00080100'"/>
+                <xsl:with-param name="vr" select="'SH'"/>
+                <xsl:with-param name="val" select="$id"/>
+              </xsl:call-template>
+            </Item>
+          </DicomAttribute>
+        </Item>
+      </DicomAttribute>
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template name="pregnancyStatus">
     <xsl:param name="ambulantStatus"/>
     <xsl:if test="$ambulantStatus">