Merge branch 'main' into fix-payer-plan

thehyve · Jan 14, 2025 · e1f2c0c · e1f2c0c
2 parents 5f6a02a + bafeb23
commit e1f2c0c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 Bugfixes
 - Incorrect references for payer_plan_period_id fields in CDM 5.4 ([#12](https://github.com/thehyve/omop-cdm/issues/12))
+- The stem table field `start_datetime` is now nullable in CDM 5.3 and 5.4 ([#14](https://github.com/thehyve/omop-cdm/issues/14))
 
 ## v0.2.0
 Update supported Python version to 3.9-3.13.

diff --git a/src/omop_cdm/dynamic/cdm531/clinical_data.py b/src/omop_cdm/dynamic/cdm531/clinical_data.py
@@ -789,7 +789,7 @@ class BaseStemTableCdm531:
     person_id: Mapped[int] = mapped_column(ForeignKey(FK_PERSON_ID), index=True, sort_order=300)
     concept_id: Mapped[int] = mapped_column(ForeignKey(FK_CONCEPT_ID), index=True, sort_order=400)
     start_date: Mapped[Optional[datetime.date]] = mapped_column(Date, sort_order=500)
-    start_datetime: Mapped[datetime.datetime] = mapped_column(DateTime, sort_order=600)
+    start_datetime: Mapped[Optional[datetime.datetime]] = mapped_column(DateTime, sort_order=600)
     end_date: Mapped[Optional[datetime.date]] = mapped_column(Date, sort_order=700)
     end_datetime: Mapped[Optional[datetime.datetime]] = mapped_column(DateTime, sort_order=800)
     verbatim_end_date: Mapped[Optional[datetime.date]] = mapped_column(Date, sort_order=900)

diff --git a/src/omop_cdm/dynamic/cdm54/clinical_data.py b/src/omop_cdm/dynamic/cdm54/clinical_data.py
@@ -824,7 +824,7 @@ class BaseStemTableCdm54:
     person_id: Mapped[int] = mapped_column(ForeignKey(FK_PERSON_ID), index=True, sort_order=300)
     concept_id: Mapped[int] = mapped_column(ForeignKey(FK_CONCEPT_ID), index=True, sort_order=400)
     start_date: Mapped[Optional[datetime.date]] = mapped_column(Date, sort_order=500)
-    start_datetime: Mapped[datetime.datetime] = mapped_column(DateTime, sort_order=600)
+    start_datetime: Mapped[Optional[datetime.datetime]] = mapped_column(DateTime, sort_order=600)
     end_date: Mapped[Optional[datetime.date]] = mapped_column(Date, sort_order=700)
     end_datetime: Mapped[Optional[datetime.datetime]] = mapped_column(DateTime, sort_order=800)
     verbatim_end_date: Mapped[Optional[datetime.date]] = mapped_column(Date, sort_order=900)