database name in cohort diagnostics cohort counts simple tab

OHDSI · Jun 26, 2023 · dc6b265 · dc6b265
1 parent 1b2b3c6
commit dc6b265
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/R/cohort-diagnostics-definition.R b/R/cohort-diagnostics-definition.R
@@ -613,18 +613,20 @@ cohortDefinitionsModule <- function(id,
         if (!hasData(data)) {
           return(NULL)
         }
+
         data <- data %>%
+          dplyr::inner_join(databaseTable, by = "databaseId") %>%
           dplyr::filter(.data$cohortId == selectedCohortDefinitionRow()$cohortId) %>%
           dplyr::filter(.data$databaseId %in% databaseTable$databaseId) %>%
-          dplyr::select("databaseId",
+          dplyr::select("databaseName",
                         "cohortSubjects",
                         "cohortEntries") %>%
           dplyr::rename("persons" = "cohortSubjects",
                         "events" = "cohortEntries")
 
         shiny::validate(shiny::need(hasData(data), "There is no data for this cohort."))
 
-        keyColumns <- c("databaseId")
+        keyColumns <- c("databaseName")
         dataColumns <- c("persons", "events")
 
         displayTable <- getDisplayTableSimple(data = data,