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

Measurement calculations #2400

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Measurement calculations #2400

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
4c9bacb
ATL-7 Cohort Definition Calculation Designer
wivern Dec 5, 2023
e98a8e9
Merge remote-tracking branch 'remotes/origin/cohort-calculation'
alex-odysseus Oct 2, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<commons-fileupload.version>1.5</commons-fileupload.version>

<circe.version>1.11.2</circe.version>
<circe.version>1.11.4-SNAPSHOT</circe.version>
<jersey.version>2.14</jersey.version>
<SqlRender.version>1.16.1</SqlRender.version>
<hive-jdbc.version>3.1.2</hive-jdbc.version>
Expand Down
17 changes: 16 additions & 1 deletion src/main/resources/i18n/messages_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,11 @@
"conditionMeasurementText_26": "gender is any of:",
"conditionMeasurementText_27": "provider specialty is any of:",
"conditionMeasurementText_28": "visit occurrence is any of:",
"conditionMeasurementText_29": "with calculated value as number",
"conditionMeasurementText_3": "occurrence start is:",
"conditionMeasurementText_30": "at the same visit",
"conditionMeasurementText_31": "restricted to the same visit",
"conditionMeasurementText_32": "of",
"conditionMeasurementText_5": "Measurement Value Operator is:",
"conditionMeasurementText_6": "with value as number",
"conditionMeasurementText_7": "Value as Concept is:",
Expand Down Expand Up @@ -3071,6 +3075,11 @@
"desc_censoring": "Exit cohort based on Measurement.",
"desc_group": "Find patients based on measurements."
},
"addCombinedMeasurement": {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A leftover from the initial implementation when a Combined Measurement was designed
To be deleted

"title": "Add Combined Measurement",
"desc_initial": "Find patients based on combination of two Measurements.",
"desc_group": "Find patients based on combination of two measurements."
},
"addObservation": {
"title": "Add Observation",
"desc_initial": "Find patients based on observations.",
Expand Down Expand Up @@ -3510,7 +3519,9 @@
"title_measurement": "Add Value as Number Criteria",
"desc_measurement": "Filter Measurements by Value as Number.",
"title_observation": "Add Value As Number Criteria",
"desc_observation": "Filter Observations by the Value As Number."
"desc_observation": "Filter Observations by the Value As Number.",
"title_combined_measurement": "Add Value as Number Criteria",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two lines should be deleted as well

"desc_combined_measurement": "Filter Combined Measurements Result by Value as Number"
},
"addRefills": {
"title_drugexposure": "Add Refills Criteria",
Expand Down Expand Up @@ -3613,6 +3624,10 @@
"desc_visit": "Filter Visit Occurrences based on distance from Place of Service to Patient.",
"title_visitDetail": "Add Place of Service Distance Criteria",
"desc_visitDetail": "Filter Visit detail based on distance from Place of Service to Patient."
},
"addMeasurementOperand": {
"title_measurement": "Add Calculation",
"desc_measurement": "Add calculated value based on a Measurement"
}
},
"newEntityNames": {
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/i18n/messages_ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,11 @@
"conditionMeasurementText_26": "성별은 다음 중 하나입니다. :",
"conditionMeasurementText_27": "제공자 전문 분야는 다음 중 하나입니다. :",
"conditionMeasurementText_28": "방문 발생(visit occurrence)은 다음 중 하나입니다. :",
"conditionMeasurementText_29": "with calculated value as number",
"conditionMeasurementText_3": "발생 시작 :",
"conditionMeasurementText_30": "at the same visit",
"conditionMeasurementText_31": "restricted to the same visit",
"conditionMeasurementText_32": "of",
"conditionMeasurementText_5": "검사 값의 연산자(operator) :",
"conditionMeasurementText_6": "수치로의 값(value as number)",
"conditionMeasurementText_7": "컨셉으로의 값(value as concept) :",
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/i18n/messages_ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,10 @@
"conditionMeasurementText_26": "пол любой из:",
"conditionMeasurementText_27": "Специализация провайдера:",
"conditionMeasurementText_28": "Событием посещения является любое из:",
"conditionMeasurementText_29": "с вычисляемым значением как",
"conditionMeasurementText_30": "в течение одного визита",
"conditionMeasurementText_31": "в течение одного визита",
"conditionMeasurementText_32": "из",
"indexDataText": "Дата индекса относится к измерению <%= conceptSetName %>."
},
"conditionObservation": {
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/i18n/messages_zh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,11 @@
"conditionMeasurementText_26": "性别是以下任一：",
"conditionMeasurementText_27": "医疗保健提供者专业是以下任何一种：",
"conditionMeasurementText_28": "就诊是以下任何一种：",
"conditionMeasurementText_29": "with calculated value as number",
"conditionMeasurementText_3": "发生开始为：",
"conditionMeasurementText_30": "at the same visit",
"conditionMeasurementText_31": "restricted to the same visit",
"conditionMeasurementText_32": "of",
"conditionMeasurementText_5": "检查检验值运算符为：",
"conditionMeasurementText_6": "以数字作为值",
"conditionMeasurementText_7": "作为概念的值是：",
Expand Down
Loading