Merge pull request #117 from samply/project_based_search

feat: added dktk project based search
samply · Aug 13, 2024 · 76c4015 · 76c4015
2 parents cda1498 + 9c3f010
commit 76c4015
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 0 deletions.
diff --git a/packages/demo/public/catalogues/catalogue-dktk.json b/packages/demo/public/catalogues/catalogue-dktk.json
@@ -20354,5 +20354,56 @@
                 ]
             }
         ]
+    },
+    {
+        "key": "project",
+        "name": "Forschungsprojekte",
+        "infoButtonText": ["Projekt-Übersicht"],
+        "childCategories": [
+            {
+                "key": "pseudo_projects",
+                "name": "Projektname",
+                "fieldType": "single-select",
+                "type": "EQUALS",
+                "system": "",
+                "criteria": [
+                    {
+                        "key": "DKTK000002089",
+                        "name": "EXLIQUID",
+                        "description": ""
+                    },
+                    {
+                        "key": "DKTK000001985",
+                        "name": "RiskY-AML",
+                        "description": ""
+                    },
+                    {
+                        "key": "DKTK000001986",
+                        "name": "MASTER-Programm",
+                        "description": ""
+                    },
+                    {
+                        "key": "DKTK000001950",
+                        "name": "IRCC",
+                        "description": ""
+                    },
+                    {
+                        "key": "DKTK000001951",
+                        "name": "ARMANI",
+                        "description": ""
+                    },
+                    {
+                        "key": "DKTK999999999",
+                        "name": "Testprojekt",
+                        "description": ""
+                    },
+                    {
+                        "key": "DKTK000000791",
+                        "name": "ReKo",
+                        "description": ""
+                    }
+                ]
+            }
+        ]
     }
 ]
diff --git a/packages/lib/src/cql-translator-service/ast-to-cql-translator.ts b/packages/lib/src/cql-translator-service/ast-to-cql-translator.ts
@@ -111,6 +111,7 @@ const getSingleton = (criterion: AstBottomLayerValue): string => {
         if (myCQL) {
             switch (myCriterion.type) {
                 case "gender":
+                case "pseudo_projects":
                 case "BBMRI_gender":
                 case "histology":
                 case "conditionValue":

diff --git a/packages/lib/src/cql-translator-service/cqlquery-mappings.ts b/packages/lib/src/cql-translator-service/cqlquery-mappings.ts
@@ -82,6 +82,10 @@ export const alias = new Map<string, string>([
 
 export const cqltemplate = new Map<string, string>([
     ["gender", "Patient.gender = '{{C}}'"],
+    [
+        "pseudo_projects",
+        "  exists ( Patient.extension E where E.url = 'http://dktk.dkfz.de/fhir/Projects/{{C}}')",
+    ],
     ["conditionValue", "exists [Condition: Code '{{C}}' from {{A1}}]"],
     [
         "conditionBodySite",
@@ -275,6 +279,7 @@ export const cqltemplate = new Map<string, string>([
 export const criterionMap = new Map<string, { type: string; alias?: string[] }>(
     [
         ["gender", { type: "gender" }],
+        ["pseudo_projects", { type: "pseudo_projects" }],
         ["histology", { type: "histology", alias: ["loinc"] }],
         ["diagnosis", { type: "conditionValue", alias: ["icd10"] }],
         ["bodySite", { type: "conditionBodySite", alias: ["bodySite"] }],