Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/icd10 percent 2 #71

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Fix/icd10 percent 2 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd7a947
fix: use subcode before percent aswell
patrickskowronekdkfz Mar 22, 2024
77a93cd
feat: added missing percent in icd10 codes
patrickskowronekdkfz Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 56 additions & 26 deletions packages/demo/public/catalogues/catalogue-dktk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4730,7 +4730,7 @@
[
{
"value": "diagnosis",
"name": "C91.0"
"name": "C91.0%"
}
],
[
Expand Down Expand Up @@ -4789,7 +4789,7 @@
[
{
"value": "diagnosis",
"name": "C91.8"
"name": "C91.8%"
}
],
[
Expand Down Expand Up @@ -4821,17 +4821,17 @@
},
{
"key": "urn:dktk:code:114:2",
"name": "Lymphatische Leukämie: Prolymphozytenleukämie",
"name": "Lymphatische Leukämie: Prolymphozytäre Leukämie",
"description": "",
"aggregatedValue": [
[
{
"value": "diagnosis",
"name": "C91.3"
"name": "C91.3%"
},
{
"value": "diagnosis",
"name": "C91.6"
"name": "C91.6%"
}
],
[
Expand Down Expand Up @@ -4894,7 +4894,7 @@
[
{
"value": "diagnosis",
"name": "C95.0"
"name": "C95.0%"
}
],
[
Expand Down Expand Up @@ -4938,39 +4938,39 @@
[
{
"value": "diagnosis",
"name": "C92.0"
"name": "C92.0%"
},
{
"value": "diagnosis",
"name": "C92.5"
"name": "C92.5%"
},
{
"value": "diagnosis",
"name": "C92.6"
"name": "C92.6%"
},
{
"value": "diagnosis",
"name": "C92.8"
"name": "C92.8%"
},
{
"value": "diagnosis",
"name": "C92.9"
"name": "C92.9%"
},
{
"value": "diagnosis",
"name": "C93.0"
"name": "C93.0%"
},
{
"value": "diagnosis",
"name": "C94.0"
"name": "C94.0%"
},
{
"value": "diagnosis",
"name": "C94.2"
"name": "C94.2%"
},
{
"value": "diagnosis",
"name": "C94.7"
"name": "C94.7%"
}
],
[
Expand Down Expand Up @@ -5047,13 +5047,13 @@
},
{
"key": "urn:dktk:code:117:2",
"name": "Myeloische Leukämie: Akute Promyelozytenleukämie",
"name": "Myeloische Leukämie: Akute Promyelozyten-Leukämie (PCL)",
"description": "",
"aggregatedValue": [
[
{
"value": "diagnosis",
"name": "C92.4"
"name": "C92.4%"
}
],
[
Expand All @@ -5072,11 +5072,11 @@
[
{
"value": "diagnosis",
"name": "C92.1"
"name": "C92.1%"
},
{
"value": "diagnosis",
"name": "C92.2"
"name": "C92.2%"
}
],
[
Expand Down Expand Up @@ -5225,15 +5225,15 @@
},
{
"value": "diagnosis",
"name": "C92.0"
"name": "C92.0%"
},
{
"value": "diagnosis",
"name": "C93.1"
"name": "C93.1%"
},
{
"value": "diagnosis",
"name": "C93.3"
"name": "C93.3%"
}
],
[
Expand Down Expand Up @@ -5349,7 +5349,7 @@
[
{
"value": "diagnosis",
"name": "C94.7"
"name": "C94.7%"
}
],
[
Expand Down Expand Up @@ -5656,7 +5656,7 @@
[
{
"value": "diagnosis",
"name": "C91.4"
"name": "C91.4%"
}
],
[
Expand Down Expand Up @@ -5831,7 +5831,7 @@
},
{
"value": "diagnosis",
"name": "C94.3"
"name": "C94.3%"
}
],
[
Expand Down Expand Up @@ -8999,6 +8999,11 @@
"name": "C88.40",
"description": "Extranodales Marginalzonen-B-Zell-Lymphom des Mukosa-assoziierten lymphatischen Gewebes [MALT-Lymphom]: Ohne Angabe einer kompletten Remission"
},
{
"key": "C88.4",
"name": "C88.4",
"description": "Extranodales Marginalzonen-B-Zell-Lymphom des Mukosa-assoziierten lymphatischen Gewebes [MALT-Lymphom]"
},
{
"key": "C88.31",
"name": "C88.31",
Expand All @@ -9009,6 +9014,11 @@
"name": "C88.30",
"description": "Immunproliferative Dünndarmkrankheit: Ohne Angabe einer kompletten Remission"
},
{
"key": "C88.0",
"name": "C88.0",
"description": "Makroglobulinämie Waldenström"
},
{
"key": "C88.01",
"name": "C88.01",
Expand All @@ -9019,6 +9029,21 @@
"name": "C88.00",
"description": "Makroglobulinämie Waldenström: Ohne Angabe einer kompletten Remission"
},
{
"key": "C88.1",
"name": "C88.1",
"description": "Nodulär-sklerosierendes (klassisches) Hodgkin-Lymphom"
},
{
"key": "C88.2",
"name": "C88.2",
"description": "Sonstige Schwerkettenkrankheit"
},
{
"key": "C88.3",
"name": "C88.3",
"description": "Immunproliferative Dünndarmkrankheit"
},
{
"key": "C88.21",
"name": "C88.21",
Expand All @@ -9034,6 +9059,11 @@
"name": "C88.71",
"description": "Sonstige bösartige immunproliferative Krankheiten: In kompletter Remission"
},
{
"key": "C88.7",
"name": "C88.7",
"description": "Sonstige bösartige immunproliferative Krankheiten"
},
{
"key": "C88.70",
"name": "C88.70",
Expand Down Expand Up @@ -14449,7 +14479,7 @@
{
"key": "C88.9",
"name": "C88.9",
"description": ""
"description": "Bösartige immunproliferative Krankheit, nicht näher bezeichnet"
},
{
"key": "C90.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/lib/src/cql-translator-service/ast-to-cql-translator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ const getSingleton = (criterion: AstBottomLayerValue): string => {
const expandedValues = criteria.filter(
(value) => value.startsWith(mykey),
);
expandedValues.push(
criterion.value.slice(0, 5),
);
expression += getSingleton({
key: criterion.key,
type: criterion.type,
Expand Down
Loading