Support filter Expiration Date for Study/Series by RESTful services #…

…1743
dcm4che · Jan 29, 2019 · 358c6b4 · 358c6b4
1 parent 2cf4b42
commit 358c6b4
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 0 deletions.
diff --git a/dcm4chee-arc-export-rs/src/main/java/org/dcm4chee/arc/export/rs/ExportMatchingRS.java b/dcm4chee-arc-export-rs/src/main/java/org/dcm4chee/arc/export/rs/ExportMatchingRS.java
@@ -145,6 +145,9 @@ public class ExportMatchingRS {
     @Pattern(regexp = "true|false")
     private String compressionfailed;
 
+    @QueryParam("ExpirationDate")
+    private String expirationDate;
+
     @QueryParam("ExternalRetrieveAET")
     private String externalRetrieveAET;
 
@@ -370,6 +373,7 @@ private org.dcm4chee.arc.query.util.QueryParam queryParam(ApplicationEntity ae)
         queryParam.setCompressionFailed(Boolean.parseBoolean(compressionfailed));
         queryParam.setExternalRetrieveAET(externalRetrieveAET);
         queryParam.setExternalRetrieveAETNot(externalRetrieveAETNot);
+        queryParam.setExpirationDate(expirationDate);
         if (patientVerificationStatus != null)
             queryParam.setPatientVerificationStatus(Patient.VerificationStatus.valueOf(patientVerificationStatus));
         if (storageID != null)

diff --git a/dcm4chee-arc-stgcmt-rs/src/main/java/org/dcm4chee/arc/stgcmt/rs/StgVerMatchingRS.java b/dcm4chee-arc-stgcmt-rs/src/main/java/org/dcm4chee/arc/stgcmt/rs/StgVerMatchingRS.java
@@ -125,6 +125,9 @@ public class StgVerMatchingRS {
     @Pattern(regexp = "true|false")
     private String compressionfailed;
 
+    @QueryParam("ExpirationDate")
+    private String expirationDate;
+
     @QueryParam("ExternalRetrieveAET")
     private String externalRetrieveAET;
 
@@ -340,6 +343,7 @@ private org.dcm4chee.arc.query.util.QueryParam queryParam(ApplicationEntity ae)
         queryParam.setCompressionFailed(Boolean.parseBoolean(compressionfailed));
         queryParam.setExternalRetrieveAET(externalRetrieveAET);
         queryParam.setExternalRetrieveAETNot(externalRetrieveAETNot);
+        queryParam.setExpirationDate(expirationDate);
         if (patientVerificationStatus != null)
             queryParam.setPatientVerificationStatus(Patient.VerificationStatus.valueOf(patientVerificationStatus));
         queryParam.setStudySizeRange(studySizeInKB);

diff --git a/dcm4chee-arc-ui2/src/swagger/swagger.json b/dcm4chee-arc-ui2/src/swagger/swagger.json
@@ -8277,6 +8277,12 @@
             "type": "boolean",
             "default": null
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "export studies which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -8474,6 +8480,12 @@
             "type": "boolean",
             "default": null
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "export series which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -8678,6 +8690,12 @@
             "type": "boolean",
             "default": null
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "export series of study which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -8875,6 +8893,12 @@
             "type": "boolean",
             "default": null
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "export instances which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -9079,6 +9103,12 @@
             "type": "boolean",
             "default": null
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "export instances of study which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -9290,6 +9320,12 @@
             "type": "boolean",
             "default": null
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "export instances of series of study which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -9741,6 +9777,12 @@
             "description": "Batch ID of scheduled tasks",
             "type": "string"
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "match only studies which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -9922,6 +9964,12 @@
             "description": "Batch ID of scheduled tasks",
             "type": "string"
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "match only series which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -10110,6 +10158,12 @@
             "description": "Batch ID of scheduled tasks",
             "type": "string"
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "match only series of study which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -10291,6 +10345,12 @@
             "description": "Batch ID of scheduled tasks",
             "type": "string"
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "match only instances of studies which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -10479,6 +10539,12 @@
             "description": "Batch ID of scheduled tasks",
             "type": "string"
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "match only instances of study which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",
@@ -10674,6 +10740,12 @@
             "description": "Batch ID of scheduled tasks",
             "type": "string"
           },
+          {
+            "name": "ExpirationDate",
+            "in": "query",
+            "description": "match only Instances of Series of Study which have expiration date between <datetime1>-<datetime2>",
+            "type": "string"
+          },
           {
             "name": "ExpirationState",
             "in": "query",