Fix DEVICES_BY_TYPE being always empty (#738)

OHDSI · Oct 5, 2023 · 5a33d22 · 5a33d22
1 parent ae15edd
commit 5a33d22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/exportToAres.R b/R/exportToAres.R
@@ -1473,10 +1473,10 @@ generateAODeviceReports <- function(connectionDetails, dataDevices, cdmDatabaseS
     dplyr::left_join(
       (
         dataDevicesByType %>%
-        dplyr::select(c(3,4)) %>%
+        dplyr::select(c(1,4,5)) %>%
         tidyr::nest(DEVICES_BY_TYPE = c(-1))
       ),
-      by = c("CONCEPT_ID" = "CONCEPT_ID")
+      by = c("CONCEPT_ID" = "DEVICE_CONCEPT_ID")
     ) %>%
     dplyr::left_join(
       (

diff --git a/inst/sql/sql_server/export/device/sqlDevicesByType.sql b/inst/sql/sql_server/export/device/sqlDevicesByType.sql
@@ -1,5 +1,5 @@
-select c1.concept_id as OBSERVATION_CONCEPT_ID, 
-  c1.concept_name as OBSERVATION_CONCEPT_NAME, 
+select c1.concept_id as DEVICE_CONCEPT_ID,
+  c1.concept_name as DEVICE_CONCEPT_NAME,
 	c2.concept_id as CONCEPT_ID,
 	c2.concept_name as CONCEPT_NAME, 
 	ar1.count_value as COUNT_VALUE