DICOM PDQ Service: Optionally perform the query on Study instead on P…

…atient Level #1716
dcm4che · Dec 3, 2018 · ef444cf · ef444cf
1 parent 95a0611
commit ef444cf
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif
@@ -1,4 +1,4 @@
-# Generated by Apache Directory Studio on November 30, 2018 12:44:41 PM
+# Generated by Apache Directory Studio on December 3, 2018 12:15:09 PM
 
 # SCHEMA "DCM4CHEE-ARCHIVE"
 dn: cn=dcm4chee-archive, ou=schema
@@ -3942,6 +3942,7 @@ m-must: dcmPDQServiceID
 m-must: dcmURI
 m-may: dicomDescription
 m-may: dcmTag
+m-may: dcmEntity
 m-may: dcmDefaultCharacterSet
 m-may: dcmProperty
 

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif
@@ -1835,6 +1835,7 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.34 NAME 'dcmPDQService'
   MAY (
     dicomDescription $
     dcmTag $
+    dcmEntity $
     dcmDefaultCharacterSet $
     dcmProperty ) )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.35 NAME 'hl7PrefetchRule'

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema b/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema
@@ -2119,6 +2119,7 @@ objectclass ( 1.2.40.0.13.1.15.110.4.34 NAME 'dcmPDQService'
   MAY (
     dicomDescription $
     dcmTag $
+    dcmEntity $
     dcmDefaultCharacterSet $
     dcmProperty ) )
 

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif
@@ -1841,6 +1841,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.34 NAME 'dcmPDQService'
   MAY (
     dicomDescription $
     dcmTag $
+    dcmEntity $
     dcmDefaultCharacterSet $
     dcmProperty ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.35 NAME 'hl7PrefetchRule'

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif
@@ -1834,6 +1834,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.34 NAME 'dcmPDQService'
   MAY (
     dicomDescription $
     dcmTag $
+    dcmEntity $
     dcmDefaultCharacterSet $
     dcmProperty ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.35 NAME 'hl7PrefetchRule'

diff --git a/dcm4chee-arc-ui2/src/assets/schema/pdqService.schema.json b/dcm4chee-arc-ui2/src/assets/schema/pdqService.schema.json
@@ -4,7 +4,8 @@
   "type": "object",
   "required": [
     "dcmPDQServiceID",
-    "dcmURI"
+    "dcmURI",
+    "dcmEntity"
   ],
   "properties": {
     "dcmPDQServiceID": {
@@ -31,9 +32,16 @@
       },
       "format": "dcmTag"
     },
+    "dcmEntity": {
+      "title": "Query Entity",
+      "description": "Indicates if the C-FIND SCP is queried for a particular Patient or for Studies of a particular Patient. Only effective for DICOM PDQ Services (URI: pdq-dicom:{AETitle}).",
+      "type": "string",
+      "enum": [ "Patient", "Study" ],
+      "default": "Patient"
+    },
     "dcmDefaultCharacterSet": {
       "title": "Default Character Set",
-      "description": "Value of Specific Character Set (0008,0005) added to Data Sets without Specific Character Set (0008,0005) attribute received from the DICOM Patient Root Query C-FIND SCP. Only effective for DICOM PDQ Services (URI: pdq-dicom:{AETitle})",
+      "description": "Value of Specific Character Set (0008,0005) added to Data Sets without Specific Character Set (0008,0005) attribute received from the C-FIND SCP. Only effective for DICOM PDQ Services (URI: pdq-dicom:{AETitle}).",
       "type": "string",
       "format": "dcmCharset"
     },