From 1336ba778d339b234b2e1f3539ea54743f69acae Mon Sep 17 00:00:00 2001 From: chinlinlee Date: Sat, 2 Dec 2023 14:23:19 +0800 Subject: [PATCH] fix: filtered global subscription not working - missing `false` for `pushSuffixValue` of `convertAllQueryToDicomTag` method for SQL - remove invalid `this` of queryOptions --- .../controller/UPS-RS/service/base-workItem.service.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/api-sql/dicom-web/controller/UPS-RS/service/base-workItem.service.js b/api-sql/dicom-web/controller/UPS-RS/service/base-workItem.service.js index ebf8ccf0..6fc526d8 100644 --- a/api-sql/dicom-web/controller/UPS-RS/service/base-workItem.service.js +++ b/api-sql/dicom-web/controller/UPS-RS/service/base-workItem.service.js @@ -42,12 +42,10 @@ class SqlBaseWorkItemService extends BaseWorkItemService { if (!globalSubscription.queryKeys) { hitGlobalSubscriptions.push(globalSubscription); } else { - //TODO: ups global query builder - let query = convertAllQueryToDicomTag(globalSubscription.queryKeys); + let query = convertAllQueryToDicomTag(globalSubscription.queryKeys, false); _.set(query, "upsInstanceUID", workItem.dicomJson.upsInstanceUID); let queryOptions = { - query: this.query, - requestParams: this.request.params + query: query }; let upsQueryBuilder = new UpsQueryBuilder(queryOptions); let dbQuery = upsQueryBuilder.build();