d

OHDSI · Jul 25, 2024 · cec7f1e · cec7f1e
1 parent 4a8ec6d
commit cec7f1e
Show file tree

Hide file tree

Showing 2 changed files with 155 additions and 93 deletions.
diff --git a/R/ConvertConceptSetDataFrameToExpression.R b/R/ConvertConceptSetDataFrameToExpression.R
@@ -84,18 +84,6 @@ convertConceptSetDataFrameToExpression <-
       conceptSetExpressionDataFrame$conceptClassId <- as.character("")
     }
 
-    if (selectAllDescendants) {
-      conceptSetExpressionDataFrame <-
-        dplyr::bind_rows(
-          conceptSetExpressionDataFrame |>
-            dplyr::filter(.data$standardConcept == "S") |>
-            dplyr::mutate(includeDescendants = TRUE),
-          conceptSetExpressionDataFrame |>
-            dplyr::filter(!.data$standardConcept == "S") |>
-            dplyr::mutate(includeDescendants = FALSE)
-        )
-    }
-
     if (updateVocabularyFields) {
       if (is.null(vocabularyDatabaseSchema)) {
         stop(
@@ -152,6 +140,18 @@ convertConceptSetDataFrameToExpression <-
           )
         )
     }
+
+    if (selectAllDescendants) {
+      conceptSetExpressionDataFrame <-
+        dplyr::bind_rows(
+          conceptSetExpressionDataFrame |>
+            dplyr::filter(.data$standardConcept == "S") |>
+            dplyr::mutate(includeDescendants = TRUE),
+          conceptSetExpressionDataFrame |>
+            dplyr::filter(!.data$standardConcept == "S") |>
+            dplyr::mutate(includeDescendants = FALSE)
+        )
+    }
 
     # note: r dataframe objects are always expected to have variables in camel case.
     # so the case conversion below should always be valid, if convention is followed