From 4c9bacb599afde268fb4ea74310b4b78569443ed Mon Sep 17 00:00:00 2001 From: wivern Date: Tue, 5 Dec 2023 11:56:54 +0300 Subject: [PATCH] ATL-7 Cohort Definition Calculation Designer --- pom.xml | 2 +- src/main/resources/i18n/messages_en.json | 17 ++++++++++++++++- src/main/resources/i18n/messages_ko.json | 4 ++++ src/main/resources/i18n/messages_ru.json | 4 ++++ src/main/resources/i18n/messages_zh.json | 4 ++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 962fac6b0..c77293214 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 1.5 - 1.11.1 + 1.11.1-SNAPSHOT 2.14 1.16.1 3.1.2 diff --git a/src/main/resources/i18n/messages_en.json b/src/main/resources/i18n/messages_en.json index be9e537c5..5ed82078b 100644 --- a/src/main/resources/i18n/messages_en.json +++ b/src/main/resources/i18n/messages_en.json @@ -608,7 +608,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:", @@ -3075,6 +3079,11 @@ "desc_censoring": "Exit cohort based on Measurement.", "desc_group": "Find patients based on measurements." }, + "addCombinedMeasurement": { + "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.", @@ -3514,7 +3523,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", + "desc_combined_measurement": "Filter Combined Measurements Result by Value as Number" }, "addRefills": { "title_drugexposure": "Add Refills Criteria", @@ -3617,6 +3628,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": { diff --git a/src/main/resources/i18n/messages_ko.json b/src/main/resources/i18n/messages_ko.json index f96801850..63b1b8fbc 100644 --- a/src/main/resources/i18n/messages_ko.json +++ b/src/main/resources/i18n/messages_ko.json @@ -559,7 +559,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) :", diff --git a/src/main/resources/i18n/messages_ru.json b/src/main/resources/i18n/messages_ru.json index f74581936..f72cf8f71 100644 --- a/src/main/resources/i18n/messages_ru.json +++ b/src/main/resources/i18n/messages_ru.json @@ -602,6 +602,10 @@ "conditionMeasurementText_26": "пол любой из:", "conditionMeasurementText_27": "Специализация провайдера:", "conditionMeasurementText_28": "Событием посещения является любое из:", + "conditionMeasurementText_29": "с вычисляемым значением как", + "conditionMeasurementText_30": "в течение одного визита", + "conditionMeasurementText_31": "в течение одного визита", + "conditionMeasurementText_32": "из", "indexDataText": "Дата индекса относится к измерению <%= conceptSetName %>." }, "conditionObservation": { diff --git a/src/main/resources/i18n/messages_zh.json b/src/main/resources/i18n/messages_zh.json index 29fb81294..7d21ebf01 100644 --- a/src/main/resources/i18n/messages_zh.json +++ b/src/main/resources/i18n/messages_zh.json @@ -608,7 +608,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": "作为概念的值是：",