Remove percentage calculation from records field in cd ieb

OHDSI · Oct 1, 2024 · 56ed305 · 56ed305
1 parent 942c6ea
commit 56ed305
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/R/cohort-diagnostics-indexEventBreakdown.R b/R/cohort-diagnostics-indexEventBreakdown.R
@@ -69,7 +69,7 @@ indexEventBreakdownView <- function(id) {
             shiny::tags$td(
               shiny::checkboxInput(
                 inputId = ns("showAsPercent"),
-                label = "Show as percentage",
+                label = "Show persons as percentage",
                 value = TRUE
               )
             )
@@ -232,17 +232,20 @@ indexEventBreakdownModule <- function(id,
       if (showDataAsPercent) {
         data <- data %>%
           dplyr::rename(
-            "persons" = "subjectPercent",
-            "records" = "conceptPercent"
+            "persons" = "subjectPercent"
           )
       } else {
         data <- data %>%
           dplyr::rename(
-            "persons" = "subjectCount",
-            "records" = "conceptCount"
+            "persons" = "subjectCount"
           )
       }
 
+      data <- data %>%
+        dplyr::rename(
+          "records" = "conceptCount"
+        )
+
       data <- data %>%
         dplyr::arrange(dplyr::desc(abs(dplyr::across(
           c("records", "persons")
@@ -278,6 +281,7 @@ indexEventBreakdownModule <- function(id,
         countLocation = countLocation,
         dataColumns = dataColumnFields,
         showDataAsPercent = showDataAsPercent,
+        excludedColumnFromPercentage = "records",
         sort = TRUE
       )
     })