fix: CQDG-00 more small bug fix

Ferlab-Ste-Justine · Oct 18, 2024 · c230825 · c230825
1 parent b7e57d2
commit c230825
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/import-task/src/main/scala/bio/ferlab/fhir/etl/transformations/Transformations.scala b/import-task/src/main/scala/bio/ferlab/fhir/etl/transformations/Transformations.scala
@@ -235,7 +235,7 @@ object Transformations {
         .withColumn("data_category_cs",
               filter(col("category")(0)("coding"), col => col("system") === DOCUMENT_DATA_CATEGORY)(0)
         )
-        .withColumn("data_category", when(isnull(col("data_category_cs")("display")), col("data_category_cs")("code"))
+        .withColumn("data_category", when(isnull(col("data_category_cs")("display")), col("data_category_cs")("display"))
           .otherwise(col("data_category_cs")("code"))
         )
         .withColumn("content_exp", explode(col("content")))

diff --git a/prepare-index/src/main/scala/bio/ferlab/fhir/etl/PrepareIndex.scala b/prepare-index/src/main/scala/bio/ferlab/fhir/etl/PrepareIndex.scala
@@ -18,13 +18,12 @@ object PrepareIndex extends SparkApp {
   val studyCentric = new StudyCentric(studyList).run()
 
 
+  //Remove studies that are restricted
   val filteredStudies =
     studyCentric("es_index_study_centric")
       .where(col("security") =!= "R")
       .select("study_id").collect().map(r => r.getString(0)).toList
 
-  filteredStudies.foreach(println)
-
   new SimpleParticipant(filteredStudies).run()