feat: query image that in recycling status (delete status 1)

Chinlinlee · Jan 6, 2024 · 1c7bf4a · 1c7bf4a
1 parent 766fe20
commit 1c7bf4a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js b/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js
@@ -56,6 +56,10 @@ class QidoRsService {
 
         delete this.request.query["includefield"];
 
+        /** @private */
+        this.isRecycle = Boolean(this.request.query?.isRecycle);
+        delete this.request.query?.isRecycle;
+
         this.initQuery_();
     }
 
@@ -89,7 +93,8 @@ class QidoRsService {
                 limit: this.limit_,
                 includeFields: this.includeFields_,
                 retrieveBaseUrl: `${dicomWebService.getBasicURL()}/studies`,
-                requestParams: this.request.params
+                requestParams: this.request.params,
+                isRecycle: this.isRecycle
             };
 
             queryAudit.onQuery(

diff --git a/api/dicom-web/qido-rs.route.js b/api/dicom-web/qido-rs.route.js
@@ -22,7 +22,8 @@ const queryValidation = {
                 return convertKeywordToHex(attribute);
             }
         )
-    ).single()
+    ).single(),
+    isRecycle: Joi.boolean().default(false)
 };
 
 /**

diff --git a/models/mongodb/schema/dicom.schema.js b/models/mongodb/schema/dicom.schema.js
@@ -78,7 +78,7 @@ class DicomSchemaOptionsFactory {
                         let docs = await mongoose.model(DicomModelNames[level]).find({
                             ...queryOptions.query,
                             deleteStatus: {
-                                $eq: 0
+                                $eq: queryOptions.isRecycle ? 1 : 0
                             }
                         }, projection)
                             .limit(queryOptions.limit)

diff --git a/utils/typeDef/dicom.js b/utils/typeDef/dicom.js
@@ -23,6 +23,7 @@
  * @property {string} retrieveBaseUrl
  * @property {object} requestParams?
  * @property {string[]} includeFields
+ * @property {boolean} [isRecycle]
  */
 
 const DICOM = true;