diff --git a/.travis.yml b/.travis.yml index cfef0950..fb8fa537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ notifications: recipients: - cknoll1@its.jnj.com - schuemie@ohdsi.org + - ta2471@cumc.columbia.edu email: on_success: change on_failure: change diff --git a/inst/sql/sql_server/AchillesHeel_v5.sql b/inst/sql/sql_server/AchillesHeel_v5.sql index 76fd6bb1..25b6134f 100644 --- a/inst/sql/sql_server/AchillesHeel_v5.sql +++ b/inst/sql/sql_server/AchillesHeel_v5.sql @@ -141,7 +141,7 @@ select CAST(100.0*count_value/statistic.total_pts AS FLOAT) as statistic_value, CAST(CONCAT('ach_',CAST(analysis_id as VARCHAR(10)),':Percentage') AS VARCHAR(100)) as measure_id from @results_database_schema.achilles_results - cross join (SELECT TOP 1 count_value as total_pts from @results_database_schema.achilles_results r where analysis_id =1) as statistic + cross join (SELECT count_value as total_pts from @results_database_schema.achilles_results r where analysis_id =1) as statistic where analysis_id in (2000,2001,2002,2003); diff --git a/inst/sql/sql_server/Achilles_v5.sql b/inst/sql/sql_server/Achilles_v5.sql index 06b154cc..a2aec89d 100644 --- a/inst/sql/sql_server/Achilles_v5.sql +++ b/inst/sql/sql_server/Achilles_v5.sql @@ -3867,8 +3867,8 @@ with rawData(stratum_id, count_value) as overallStats (stratum_id, avg_value, stdev_value, min_value, max_value, total) as ( select stratum_id, - CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, - CAST(stdev(count_value) AS FLOAT) as stdev_value, + CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, + CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, max(count_value) as max_value, count_big(*) as total @@ -4743,7 +4743,7 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, + select stratum1_id, CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, @@ -5075,7 +5075,7 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, + select stratum1_id, CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, @@ -5340,8 +5340,8 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, - CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, + select stratum1_id, + CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, max(count_value) as max_value, @@ -5708,7 +5708,7 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, + select stratum1_id, CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, @@ -5839,7 +5839,7 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, + select stratum1_id, CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, @@ -5905,7 +5905,7 @@ with rawData(stratum1_id, count_value) as overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( select stratum1_id, - CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, + CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, max(count_value) as max_value, @@ -5969,8 +5969,8 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, - CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, + select stratum1_id, + CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, max(count_value) as max_value, @@ -6033,7 +6033,7 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, + select stratum1_id, CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, @@ -6480,7 +6480,7 @@ with rawData(stratum1_id, count_value) as overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( select stratum1_id, - CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, +CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, max(count_value) as max_value, @@ -6543,8 +6543,8 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, - CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, + select stratum1_id, + CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, max(count_value) as max_value, @@ -6607,7 +6607,7 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, + select stratum1_id, CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, @@ -6735,8 +6735,8 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, - CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, + select stratum1_id, + CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value, max(count_value) as max_value, @@ -6800,7 +6800,7 @@ with rawData(stratum1_id, count_value) as ), overallStats (stratum1_id, avg_value, stdev_value, min_value, max_value, total) as ( - select stratum1_id, + select stratum1_id, CAST(avg(1.0 * count_value) AS FLOAT) as avg_value, CAST(stdev(count_value) AS FLOAT) as stdev_value, min(count_value) as min_value,