feat: complete series query builder

Chinlinlee · Aug 4, 2023 · 4740615 · 4740615
1 parent f085f7c
commit 4740615
Show file tree

Hide file tree

Showing 2 changed files with 167 additions and 12 deletions.
diff --git a/api-sql/dicom-web/controller/QIDO-RS/service/querybuilder.js b/api-sql/dicom-web/controller/QIDO-RS/service/querybuilder.js
@@ -22,7 +22,11 @@ class BaseQueryBuilder {
             for (let i = 0; i < commaValue.length; i++) {
                 let value = this.getWildCardQuery(commaValue[i][key]);
                 try {
-                    this[`get${dictionary.tag[key]}`](value);
+                    if (key.includes(".")) {
+                        this[key](value);
+                    } else {
+                        this[`get${dictionary.tag[key]}`](value);
+                    }
                 } catch (e) {
                     if (e.message.includes("not a function")) break;
                 }

diff --git a/api-sql/dicom-web/controller/QIDO-RS/service/seriesQueryBuilder.js b/api-sql/dicom-web/controller/QIDO-RS/service/seriesQueryBuilder.js
@@ -2,8 +2,27 @@ const { dictionary } = require("@models/DICOM/dicom-tags-dic");
 const { BaseQueryBuilder } = require("./querybuilder");
 const { Op, Sequelize } = require("sequelize");
 const { raccoonConfig } = require("@root/config-class");
+const _ = require("lodash");
+const { PersonNameModel } = require("@models/sql/models/personName.model");
+const sequelize = require("@models/sql/instance");
 
 class SeriesQueryBuilder extends BaseQueryBuilder {
+    constructor(queryOptions) {
+        super(queryOptions);
+        let seriesRequestAttributeSequence = new SeriesRequestAttributeSequence(this);
+        this["00400275.00080050"] = SeriesRequestAttributeSequence.prototype.getAccessionNumber.bind(seriesRequestAttributeSequence);
+        this["00400275.00080051.00400031"] = SeriesRequestAttributeSequence.prototype.getIssuerLocalNameSpaceEntityID.bind(seriesRequestAttributeSequence);
+        this["00400275.00080051.00400032"] = SeriesRequestAttributeSequence.prototype.getIssuerUniversalEntityID.bind(seriesRequestAttributeSequence);
+        this["00400275.00080051.00400033"] = SeriesRequestAttributeSequence.prototype.getIssuerUniversalEntityIDType.bind(seriesRequestAttributeSequence);
+        this["00400275.00321033"] = SeriesRequestAttributeSequence.prototype.getRequestingService.bind(seriesRequestAttributeSequence);
+        this["00400275.00401001"] = SeriesRequestAttributeSequence.prototype.getRequestedProcedureID.bind(seriesRequestAttributeSequence);
+        this["00400275.0020000D"] = SeriesRequestAttributeSequence.prototype.getStudyInstanceUID.bind(seriesRequestAttributeSequence);
+
+        this.includeQueries.push({
+            model: sequelize.model("Study"),
+            attributes: []
+        });
+    }
     getSeriesDate(value) {
         let q = this.getDateQuery(dictionary.keyword.SeriesDate, value);
         this.query = {
@@ -39,19 +58,27 @@ class SeriesQueryBuilder extends BaseQueryBuilder {
     }
 
     getPerformingPhysicianName(value) {
-        let q = this.getPersonNameJsonArrayQuery(dictionary.keyword.PerformingPhysicianName, value);
-        this.query = {
-            ...this.query,
-            ...q
-        };
+        let { query } = this.getPersonNameQuery(dictionary.keyword.PerformingPhysicianName, value);
+        this.includeQueries.push({
+            model: PersonNameModel,
+            as: "performingPhysicianName",
+            where: {
+                ...query
+            },
+            attributes: []
+        });
     }
 
     getOperatorsName(value) {
-        let q = this.getPersonNameJsonArrayQuery(dictionary.keyword.OperatorsName, value);
-        this.query = {
-            ...this.query,
-            ...q
-        };
+        let { query } = this.getPersonNameQuery(dictionary.keyword.OperatorsName, value);
+        this.includeQueries.push({
+            model: PersonNameModel,
+            as: "operatorsName",
+            where: {
+                ...query
+            },
+            attributes: []
+        });
     }
 
     getSeriesNumber(value) {
@@ -62,7 +89,131 @@ class SeriesQueryBuilder extends BaseQueryBuilder {
         };
     }
 
-
+
+}
+
+class SeriesRequestAttributeSequence {
+    constructor(seriesQueryBuilder) {
+        /** @type {SeriesQueryBuilder} */
+        this.seriesQueryBuilder = seriesQueryBuilder;
+    }
+    getAccessionNumber(value) {
+        if (raccoonConfig.sqlDbConfig.dialect === "postgres") {
+            value = this.seriesQueryBuilder.getWildCardRegexString(value);
+            let q = {
+                [Op.or]: [
+                    Sequelize.literal(`"x00400275" @? '$."00080050".Value[0] ? (@ like_regex "${value}")'`)
+                ]
+            };
+            this.seriesQueryBuilder.query = {
+                ...this.seriesQueryBuilder.query,
+                ...q
+            };
+        }
+        throw new Error("Not implemented");
+    }
+
+    getIssuerLocalNameSpaceEntityID(value) {
+        if (raccoonConfig.sqlDbConfig.dialect === "postgres") {
+            value = this.seriesQueryBuilder.getWildCardRegexString(value);
+            let q = {
+                [Op.or]: [
+                    Sequelize.literal(`"x00400275" @? '$."00080051".Value[0]."00400031".Value[0] ? (@ like_regex "${value}")'`)
+                ]
+            };
+
+            this.seriesQueryBuilder.query = {
+                ...this.seriesQueryBuilder.query,
+                ...q
+            };
+        }
+
+        throw new Error("Not implemented");
+    }
+
+    getIssuerUniversalEntityID(value) {
+        if (raccoonConfig.sqlDbConfig.dialect === "postgres") {
+            value = this.seriesQueryBuilder.getWildCardRegexString(value);
+            let q = {
+                [Op.or]: [
+                    Sequelize.literal(`"x00400275" @? '$."00080051".Value[0]."00400032".Value[0] ? (@ like_regex "${value}")'`)
+                ]
+            };
+
+            this.seriesQueryBuilder.query = {
+                ...this.seriesQueryBuilder.query,
+                ...q
+            };
+        }
+        throw new Error("Not implemented");
+    }
+
+    getIssuerUniversalEntityIDType(value) {
+        if (raccoonConfig.sqlDbConfig.dialect === "postgres") {
+            value = this.seriesQueryBuilder.getWildCardRegexString(value);
+            let q = {
+                [Op.or]: [
+                    Sequelize.literal(`"x00400275" @? '$."00080051".Value[0]."00400033".Value[0] ? (@ like_regex "${value}")'`)
+                ]
+            };
+
+            this.seriesQueryBuilder.query = {
+                ...this.seriesQueryBuilder.query,
+                ...q
+            };
+        }
+        throw new Error("Not implemented");
+    }
+
+    getRequestingService(value) {
+        if (raccoonConfig.sqlDbConfig.dialect === "postgres") {
+            value = this.seriesQueryBuilder.getWildCardRegexString(value);
+            let q = {
+                [Op.or]: [
+                    Sequelize.literal(`"x00400275" @? '$."00321033".Value[0] ? (@ like_regex "${value}")'`)
+                ]
+            };
+
+            this.seriesQueryBuilder.query = {
+                ...this.seriesQueryBuilder.query,
+                ...q
+            };
+        }
+        throw new Error("Not implemented");
+    }
+
+    getRequestedProcedureID(value) {
+        if (raccoonConfig.sqlDbConfig.dialect === "postgres") {
+            value = this.seriesQueryBuilder.getWildCardRegexString(value);
+            let q = {
+                [Op.or]: [
+                    Sequelize.literal(`"x00400275" @? '$."00401001".Value[0] ? (@ like_regex "${value}")'`)
+                ]
+            };
+            this.seriesQueryBuilder.query = {
+                ...this.seriesQueryBuilder.query,
+                ...q
+            };
+        }
+        throw new Error("Not implemented");
+    }
+
+    getStudyInstanceUID(value) {
+        if (raccoonConfig.sqlDbConfig.dialect === "postgres") {
+            value = this.seriesQueryBuilder.getWildCardRegexString(value);
+            let q = {
+                [Op.or]: [
+                    Sequelize.literal(`"x00400275" @? '$."0020000D".Value[0] ? (@ like_regex "${value}")'`)
+                ]
+            };
+            this.seriesQueryBuilder.query = {
+                ...this.seriesQueryBuilder.query,
+                ...q
+            };
+        }
+        throw new Error("Not implemented");
+    }
+
 }
 
 module.exports.SeriesQueryBuilder = SeriesQueryBuilder;