Merge pull request #783 from OHDSI/unit_concept_id

unit_concept_id field added to ares export of measurement tables
OHDSI · Feb 26, 2025 · 286b637 · 286b637
2 parents 1f88b15 + c8c446d
commit 286b637
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/R/exportToAres.R b/R/exportToAres.R
@@ -1070,10 +1070,10 @@ generateAOMeasurementReports <- function(connectionDetails, dataMeasurements, cd
     dplyr::select(c(1, 2, 3, 4, 5, 6, 7, 8, 9))
   dataRecordsByUnit <-
     DatabaseConnector::querySql(conn, queryRecordsByUnit) %>%
-    dplyr::select(c(1, 4, 5))
+    dplyr::select(c(1, 4, 5, 6))
   dataMeasurementValueDistribution <-
     DatabaseConnector::querySql(conn, queryMeasurementValueDistribution) %>%
-    dplyr::select(c(1, 2, 3, 4, 5, 6, 7, 8, 9))
+    dplyr::select(c(1, 2, 3, 4, 5, 6, 7, 8, 9, 10))
   dataLowerLimitDistribution <-
     DatabaseConnector::querySql(conn, queryLowerLimitDistribution) %>%
     dplyr::select(c(1, 2, 3, 4, 5, 6, 7, 8, 9))

diff --git a/inst/sql/sql_server/export/measurement/sqlMeasurementValueDistribution.sql b/inst/sql/sql_server/export/measurement/sqlMeasurementValueDistribution.sql
@@ -6,7 +6,8 @@ select c1.concept_id as concept_id,
 	ard1.median_value as median_value,
 	ard1.p75_value as P75_value,
 	ard1.p90_value as P90_value,
-	ard1.max_value as max_value
+	ard1.max_value as max_value,
+	ard1.stratum_2 as unit_concept_id
 from (
   select cast(stratum_1 as bigint) stratum_1, cast(stratum_2 as bigint) stratum_2, min_value, p10_value, p25_value, median_value, p75_value, p90_value, max_value
   FROM @results_database_schema.achilles_results_dist

diff --git a/inst/sql/sql_server/export/measurement/sqlRecordsByUnit.sql b/inst/sql/sql_server/export/measurement/sqlRecordsByUnit.sql
@@ -2,12 +2,13 @@ select c1.concept_id as MEASUREMENT_CONCEPT_ID,
 	c1.concept_name as MEASUREMENT_CONCEPT_NAME,
 	c2.concept_id as concept_id,
 	c2.concept_name as concept_name, 
-	ar1.count_value as count_value
+	ar1.count_value as count_value,
+	ar1.stratum_2 as unit_concept_id
 from (
   select cast(stratum_1 as bigint) stratum_1, cast(stratum_2 as bigint) stratum_2, count_value
   FROM @results_database_schema.achilles_results
   where analysis_id = 1807
   GROUP BY analysis_id, stratum_1, stratum_2, count_value
 ) ar1
 inner join @vocab_database_schema.concept c1 on ar1.stratum_1 = c1.concept_id
-inner join @vocab_database_schema.concept c2 on ar1.stratum_2 = c2.concept_id
+inner join @vocab_database_schema.concept c2 on ar1.stratum_2 = c2.concept_id