fixed the visit_rank_order of the death event

knatarajan-lab · Jan 23, 2025 · ad3a425 · ad3a425
1 parent b7163aa
commit ad3a425
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/cehrbert_data/decorators/death_event_decorator.py b/src/cehrbert_data/decorators/death_event_decorator.py
@@ -41,7 +41,12 @@ def _decorate(self, patient_events: DataFrame):
             death_records.where(F.col("standard_concept_id") == VE_TOKEN)
             .withColumn(
                 "record_rank",
-                F.row_number().over(W.partitionBy("person_id", "cohort_member_id").orderBy(F.desc("date"))),
+                F.row_number().over(
+                    W.partitionBy("person_id", "cohort_member_id").orderBy(
+                        F.desc("datetime"),
+                        F.desc("visit_rank_order")
+                    )
+                ),
             )
             .where(F.col("record_rank") == 1)
             .drop("record_rank")