From 1a0464ffc1396ed2f850861d3b78bf55cf263743 Mon Sep 17 00:00:00 2001 From: Ger Inberg Date: Tue, 15 Oct 2024 19:54:09 +0200 Subject: [PATCH 1/2] fix query --- inst/sql/sql_server/MeasurementValue.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/sql/sql_server/MeasurementValue.sql b/inst/sql/sql_server/MeasurementValue.sql index 28fc5731..55c56b1d 100644 --- a/inst/sql/sql_server/MeasurementValue.sql +++ b/inst/sql/sql_server/MeasurementValue.sql @@ -51,7 +51,7 @@ FROM ( {@temporal_sequence} ? { -FLOOR(DATEDIFF(@time_part, measurement_date, cohort.cohort_start_date)*1.0/@time_interval ) as time_id +FLOOR(DATEDIFF(@time_part, measurement_date, cohort.cohort_start_date)*1.0/@time_interval ) as time_id, ROW_NUMBER() OVER (PARTITION BY cohort.@row_id_field, measurement.measurement_concept_id, FLOOR(DATEDIFF(@time_part, measurement_date, cohort.cohort_start_date)*1.0/@time_interval ) ORDER BY measurement_date DESC, measurement.unit_concept_id, value_as_number) AS rn, } : { From c5aa2daf1766c5c6ef223ca69bc3c5e81028687d Mon Sep 17 00:00:00 2001 From: Ger Inberg Date: Tue, 15 Oct 2024 20:04:01 +0200 Subject: [PATCH 2/2] update test --- tests/testthat/test-GetCovariatesTemporalSequence.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testthat/test-GetCovariatesTemporalSequence.R b/tests/testthat/test-GetCovariatesTemporalSequence.R index 8b1d4c11..a592c922 100644 --- a/tests/testthat/test-GetCovariatesTemporalSequence.R +++ b/tests/testthat/test-GetCovariatesTemporalSequence.R @@ -55,6 +55,8 @@ test_that("getDbCovariateData works with createTemporalSequenceCovariateSettings useDemographicsAgeGroup = T, useConditionEraGroupStart = T, useDrugEraStart = T, + useMeasurement = T, + useMeasurementValue = T, timePart = "month", timeInterval = 1, sequenceEndDay = -1,