药品流向管理内容优化-初步

backend/app/models/drug_shipment.py

@@ -1,7 +1,7 @@
 import uuid
 from datetime import date, datetime
 
-from sqlalchemy import Date, DateTime, ForeignKey, String, Text, func
+from sqlalchemy import Date, DateTime, ForeignKey, Integer, String, Text, func
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -14,13 +14,14 @@ class DrugShipment(Base):
     id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     study_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("studies.id"), index=True, nullable=False)
     direction: Mapped[str] = mapped_column(String(20), nullable=False)
+    center_id: Mapped[uuid.UUID | None] = mapped_column(UUID(as_uuid=True), ForeignKey("sites.id"), index=True, nullable=True)
     site_name: Mapped[str] = mapped_column(String(255), nullable=False)
-    drug_desc: Mapped[str] = mapped_column(Text, nullable=False)
     ship_date: Mapped[date | None] = mapped_column(Date, nullable=True)
+    receive_date: Mapped[date | None] = mapped_column(Date, nullable=True)
+    quantity: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    batch_no: Mapped[str | None] = mapped_column(String(100), nullable=True)
     carrier: Mapped[str | None] = mapped_column(String(100), nullable=True)
     tracking_no: Mapped[str | None] = mapped_column(String(100), nullable=True)
-    from_party: Mapped[str | None] = mapped_column(String(255), nullable=True)
-    to_party: Mapped[str | None] = mapped_column(String(255), nullable=True)
     status: Mapped[str] = mapped_column(String(30), nullable=False)
     remark: Mapped[str | None] = mapped_column(Text, nullable=True)
     created_by: Mapped[uuid.UUID | None] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)