Moved default PDU Template Param values from LDAP to XSL #3844

dcm4che · Nov 9, 2022 · d4a3ff7 · d4a3ff7
1 parent 1685776
commit d4a3ff7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 30 deletions.
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/5.29.1/update-dev-5.29.1.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/5.29.1/update-dev-5.29.1.ldif
@@ -8,12 +8,6 @@ hl7PSUStudyTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/dcm2hl7-psu.xsl
 add: hl7PSUMppsTemplateURI
 hl7PSUMppsTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/mpps2hl7-psu.xsl
 -
-add: hl7PSUTemplateParam
-hl7PSUTemplateParam: PlacerOrderNumberImagingServiceRequest={StudyInstanceUID,hash}
-hl7PSUTemplateParam: FillerOrderNumberImagingServiceRequest={StudyInstanceUID,hash}
-hl7PSUTemplateParam: RequestedProcedureID={StudyInstanceUID,hash}
-hl7PSUTemplateParam: AccessionNumber={StudyInstanceUID,hash}
--
 replace: dicomVendorData
 dicomVendorData:< file:vendor-data.zip
 
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif
@@ -106,10 +106,6 @@ dcmTrustStorePin: secret
 dcmTaskPollingInterval: PT1M
 dcmXDSiImagingDocumentSourceAETitle: DCM4CHEE
 dcmWadoSR2TextTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/dsr2text.xsl
-hl7PSUTemplateParam: PlacerOrderNumberImagingServiceRequest={StudyInstanceUID,hash}
-hl7PSUTemplateParam: FillerOrderNumberImagingServiceRequest={StudyInstanceUID,hash}
-hl7PSUTemplateParam: RequestedProcedureID={StudyInstanceUID,hash}
-hl7PSUTemplateParam: AccessionNumber={StudyInstanceUID,hash}
 dcmPurgeQueueMessagePollingInterval: PT1H
 dcmKeyStorePin: secret
 dicomInstalled: TRUE

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif
@@ -215,10 +215,6 @@ dcmTrustStorePin: secret
 dcmTaskPollingInterval: PT1M
 dcmXDSiImagingDocumentSourceAETitle: DCM4CHEE
 dcmWadoSR2TextTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/dsr2text.xsl
-hl7PSUTemplateParam: PlacerOrderNumberImagingServiceRequest={StudyInstanceUID,hash}
-hl7PSUTemplateParam: FillerOrderNumberImagingServiceRequest={StudyInstanceUID,hash}
-hl7PSUTemplateParam: RequestedProcedureID={StudyInstanceUID,hash}
-hl7PSUTemplateParam: AccessionNumber={StudyInstanceUID,hash}
 dcmPurgeQueueMessagePollingInterval: PT1H
 dcmKeyStorePin: secret
 dicomInstalled: TRUE

diff --git a/dcm4chee-arc-conf-data/src/main/resources/dcm2hl7-psu.xsl b/dcm4chee-arc-conf-data/src/main/resources/dcm2hl7-psu.xsl
@@ -11,10 +11,10 @@
     <xsl:param name="charset" />
     <xsl:param name="isPIDPV1" />
     <xsl:param name="includeNullValues" />
-    <xsl:param name="RequestedProcedureID"/>
-    <xsl:param name="AccessionNumber"/>
-    <xsl:param name="PlacerOrderNumberImagingServiceRequest"/>
-    <xsl:param name="FillerOrderNumberImagingServiceRequest"/>
+    <xsl:param name="RequestedProcedureID">{StudyInstanceUID,hash}</xsl:param>
+    <xsl:param name="AccessionNumber">{StudyInstanceUID,hash}</xsl:param>
+    <xsl:param name="PlacerOrderNumberImagingServiceRequest">{StudyInstanceUID,hash}</xsl:param>
+    <xsl:param name="FillerOrderNumberImagingServiceRequest">{StudyInstanceUID,hash}</xsl:param>
 
     <xsl:template match="/NativeDicomModel">
         <hl7>

diff --git a/dcm4chee-arc-conf-data/src/main/resources/mpps2hl7-psu.xsl b/dcm4chee-arc-conf-data/src/main/resources/mpps2hl7-psu.xsl
@@ -12,10 +12,10 @@
     <xsl:param name="isPIDPV1" />
     <xsl:param name="ppsStatus" />
     <xsl:param name="includeNullValues" />
-    <xsl:param name="RequestedProcedureID"/>
-    <xsl:param name="AccessionNumber"/>
-    <xsl:param name="PlacerOrderNumberImagingServiceRequest"/>
-    <xsl:param name="FillerOrderNumberImagingServiceRequest"/>
+    <xsl:param name="RequestedProcedureID">{StudyInstanceUID,hash}</xsl:param>
+    <xsl:param name="AccessionNumber">{StudyInstanceUID,hash}</xsl:param>
+    <xsl:param name="PlacerOrderNumberImagingServiceRequest">{StudyInstanceUID,hash}</xsl:param>
+    <xsl:param name="FillerOrderNumberImagingServiceRequest">{StudyInstanceUID,hash}</xsl:param>
 
     <xsl:template match="/NativeDicomModel">
         <hl7>

diff --git a/dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java b/dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java
@@ -1181,13 +1181,6 @@ private static AuditSuppressCriteria suppressAuditQueryFromArchive() {
             "SIU^S15"
     };
 
-    static final String[] HL7PSU_PARAMS = {
-            "RequestedProcedureID={StudyInstanceUID,hash}",
-            "AccessionNumber={StudyInstanceUID,hash}",
-            "PlacerOrderNumberImagingServiceRequest={StudyInstanceUID,hash}",
-            "FillerOrderNumberImagingServiceRequest={StudyInstanceUID,hash}"
-    };
-
     static final String AE_TITLE = "DCM4CHEE";
     static final String HL7_ADT2DCM_XSL = "${jboss.server.temp.url}/dcm4chee-arc/hl7-adt2dcm.xsl";
     static final String HL7_DCM2ADT_XSL = "${jboss.server.temp.url}/dcm4chee-arc/hl7-dcm2adt.xsl";
@@ -1768,7 +1761,6 @@ private static void addArchiveDeviceExtension(Device device, ConfigType configTy
         ext.setOutgoingPatientUpdateTemplateURI(HL7_DCM2ADT_XSL);
         ext.setHl7PSUMppsTemplateURI(MPPS2HL7_PSU_XSL);
         ext.setHl7PSUStudyTemplateURI(STUDY2HL7_PSU_XSL);
-        ext.setHL7PSUTemplateParams(HL7PSU_PARAMS);
         ext.setUnzipVendorDataToURI(UNZIP_VENDOR_DATA);
         ext.setQidoMaxNumberOfResults(QIDO_MAX_NUMBER_OF_RESULTS);
         ext.setIanTaskPollingInterval(IAN_TASK_POLLING_INTERVAL);