fix: CQDG-00 more small bug fix

Ferlab-Ste-Justine · Oct 18, 2024 · 1c60b7c · 1c60b7c
1 parent c230825
commit 1c60b7c
Showing 1 changed file with 3 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
@@ -230,13 +230,13 @@ object Transformations {
            filter(col("type")("coding"), col => col("system") === DOCUMENT_DATA_TYPE)(0)
         )
         .withColumn("data_type", when(isnull(col("data_type_cs")("display")), col("data_type_cs")("code"))
-          .otherwise(col("data_type_cs")("code"))
+          .otherwise(col("data_type_cs")("display"))
         )
         .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")("display"))
-          .otherwise(col("data_category_cs")("code"))
+        .withColumn("data_category", when(isnull(col("data_category_cs")("display")), col("data_category_cs")("code"))
+          .otherwise(col("data_category_cs")("display"))
         )
         .withColumn("content_exp", explode(col("content")))
         .withColumn("file_size", retrieveSize(firstNonNull(filter(col("content_exp")("attachment")("extension"), col => col("url") === DOCUMENT_SIZE_S_D))("fileSize")))