Add Contributing Equipment Sequence (0018,A001) on Instance level at…

…tributes filter in default and sample configuration of archive fix #3921
dcm4che · Jan 12, 2023 · 1abe948 · 1abe948
1 parent 89d377c
commit 1abe948
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
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
@@ -25,4 +25,9 @@ dcmuiActionParam: recreate
 dn: dcmEntity=Instance,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 changetype: modify
 add: dcmTag
-dcmTag: 0040A360
+dcmTag: 0040A360
+
+dn: dcmAttributeSetID=AttributeFilters+dcmAttributeSetType=WADO_RS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: modify
+add: dcmTag
+dcmTag: 0040A360
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/5.29.2/update-dev-5.29.2.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/5.29.2/update-dev-5.29.2.ldif
@@ -0,0 +1,11 @@
+version: 1
+
+dn: dcmEntity=Instance,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: modify
+add: dcmTag
+dcmTag: 0018A001
+
+dn: dcmAttributeSetID=AttributeFilters+dcmAttributeSetType=WADO_RS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: modify
+add: dcmTag
+dcmTag: 0018A001
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif
@@ -2850,6 +2850,7 @@ dcmTag: 00080033
 dcmTag: 00080201
 dcmTag: 00081115
 dcmTag: 00082218
+dcmTag: 0018A001
 dcmTag: 00200013
 dcmTag: 00200242
 dcmTag: 00209161
@@ -3753,6 +3754,7 @@ dcmTag: 00120064
 dcmTag: 00120081
 dcmTag: 00120082
 dcmTag: 00180015
+dcmTag: 0018A001
 dcmTag: 0020000D
 dcmTag: 0020000E
 dcmTag: 00200010

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif
@@ -3324,6 +3324,7 @@ dcmTag: 00080033
 dcmTag: 00080201
 dcmTag: 00081115
 dcmTag: 00082218
+dcmTag: 0018A001
 dcmTag: 00200013
 dcmTag: 00200242
 dcmTag: 00209161
@@ -4502,6 +4503,7 @@ dcmTag: 00120064
 dcmTag: 00120081
 dcmTag: 00120082
 dcmTag: 00180015
+dcmTag: 0018A001
 dcmTag: 0020000D
 dcmTag: 0020000E
 dcmTag: 00200010

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
@@ -421,6 +421,7 @@ private static AuditSuppressCriteria suppressAuditQueryFromArchive() {
             Tag.TimezoneOffsetFromUTC,
             Tag.ReferencedSeriesSequence,
             Tag.AnatomicRegionSequence,
+            Tag.ContributingEquipmentSequence,
             Tag.InstanceNumber,
             Tag.NumberOfFrames,
             Tag.Rows,