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

backend/app/api/v1/drug_shipments.py

@@ -6,6 +6,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from app.core.deps import get_current_user, get_db_session, require_study_member, require_study_roles
 from app.crud import audit as audit_crud
 from app.crud import drug_shipment as shipment_crud
+from app.crud import site as site_crud
 from app.crud import study as study_crud
 from app.schemas.drug_shipment import DrugShipmentCreate, DrugShipmentRead, DrugShipmentUpdate
 
@@ -32,6 +33,10 @@ async def create_shipment(
     current_user=Depends(get_current_user),
 ) -> DrugShipmentRead:
     await _ensure_study_exists(db, study_id)
+    site = await site_crud.get_site(db, shipment_in.center_id)
+    if not site or site.study_id != study_id:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="分中心不存在")
+    shipment_in = shipment_in.model_copy(update={"site_name": site.name})
     shipment = await shipment_crud.create_shipment(db, study_id, shipment_in, created_by=current_user.id)
     await audit_crud.log_action(
         db,
@@ -53,8 +58,10 @@ async def create_shipment(
 )
 async def list_shipments(
     study_id: uuid.UUID,
+    center_id: uuid.UUID | None = None,
     site_name: str | None = None,
     tracking_no: str | None = None,
+    direction: str | None = None,
     status: str | None = None,
     skip: int = 0,
     limit: int = 100,
@@ -62,7 +69,15 @@ async def list_shipments(
 ) -> list[DrugShipmentRead]:
     await _ensure_study_exists(db, study_id)
     items = await shipment_crud.list_shipments(
-        db, study_id, site_name=site_name, tracking_no=tracking_no, status=status, skip=skip, limit=limit
+        db,
+        study_id,
+        center_id=center_id,
+        site_name=site_name,
+        tracking_no=tracking_no,
+        direction=direction,
+        status=status,
+        skip=skip,
+        limit=limit,
     )
     return [DrugShipmentRead.model_validate(item) for item in items]
 
@@ -100,6 +115,11 @@ async def update_shipment(
     shipment = await shipment_crud.get_shipment(db, shipment_id)
     if not shipment or shipment.study_id != study_id:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="运输记录不存在")
+    if shipment_in.center_id:
+        site = await site_crud.get_site(db, shipment_in.center_id)
+        if not site or site.study_id != study_id:
+            raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="分中心不存在")
+        shipment_in = shipment_in.model_copy(update={"site_name": site.name})
     shipment = await shipment_crud.update_shipment(db, shipment, shipment_in)
     await audit_crud.log_action(
         db,