修复前后端显示异常问题（受试者、中心、负责人、日期等）

backend/app/api/v1/attachments.py

@@ -15,6 +15,7 @@ from app.crud import user as user_crud
 from app.crud import member as member_crud
 from app.core.security import decode_token
 from app.schemas.attachment import AttachmentRead
+from app.schemas.user import UserDisplay
 
 router = APIRouter()
 global_router = APIRouter()
@@ -74,7 +75,14 @@ async def upload_attachment(
         operator_id=current_user.id,
         operator_role=current_user.role,
     )
-    return attachment
+    return AttachmentRead(
+        id=attachment.id,
+        filename=attachment.filename,
+        file_size=attachment.file_size,
+        uploaded_by=UserDisplay.model_validate(current_user) if current_user else None,
+        uploaded_by_id=attachment.uploaded_by,
+        uploaded_at=attachment.uploaded_at,
+    )
 
 
 @router.get(
@@ -90,7 +98,22 @@ async def list_attachments(
 ) -> list[AttachmentRead]:
     await _ensure_study_exists(db, study_id)
     attachments = await attachment_crud.list_attachments(db, study_id, entity_type, entity_id)
-    return list(attachments)
+    user_ids = {a.uploaded_by for a in attachments if a.uploaded_by}
+    users_map = await user_crud.get_users_by_ids(db, user_ids)
+    result: list[AttachmentRead] = []
+    for a in attachments:
+        user = users_map.get(a.uploaded_by)
+        result.append(
+            AttachmentRead(
+                id=a.id,
+                filename=a.filename,
+                file_size=a.file_size,
+                uploaded_by=UserDisplay.model_validate(user) if user else None,
+                uploaded_by_id=a.uploaded_by,
+                uploaded_at=a.uploaded_at,
+            )
+        )
+    return result
 
 
 @router.get(

backend/app/api/v1/members.py

@@ -6,7 +6,9 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from app.core.deps import get_db_session, require_study_member, require_study_roles
 from app.crud import member as member_crud
 from app.crud import study as study_crud
-from app.schemas.member import StudyMemberCreate, StudyMemberRead, StudyMemberUpdate
+from app.crud import user as user_crud
+from app.schemas.member import StudyMemberCreate, StudyMemberRead, StudyMemberReadWithUser, StudyMemberUpdate
+from app.schemas.user import UserDisplay
 
 router = APIRouter()
 
@@ -39,7 +41,7 @@ async def add_member(
 
 @router.get(
     "/",
-    response_model=list[StudyMemberRead],
+    response_model=list[StudyMemberReadWithUser],
     dependencies=[Depends(require_study_member())],
 )
 async def list_members(
@@ -47,10 +49,31 @@ async def list_members(
     skip: int = 0,
     limit: int = 100,
     db: AsyncSession = Depends(get_db_session),
-) -> list[StudyMemberRead]:
+) -> list[StudyMemberReadWithUser]:
     await _ensure_study_exists(db, study_id)
     members = await member_crud.list_members(db, study_id, skip=skip, limit=limit)
-    return list(members)
+    user_ids = {m.user_id for m in members}
+    users_map = await user_crud.get_users_by_ids(db, user_ids)
+    result: list[StudyMemberReadWithUser] = []
+    for m in members:
+        # 仅返回项目内启用的成员 + 账号启用的用户
+        if not m.is_active:
+            continue
+        user = users_map.get(m.user_id)
+        if not user or not user.is_active:
+            continue
+        result.append(
+            StudyMemberReadWithUser(
+                id=m.id,
+                study_id=m.study_id,
+                user_id=m.user_id,
+                role_in_study=m.role_in_study,
+                is_active=m.is_active,
+                added_at=m.added_at,
+                user=UserDisplay.model_validate(user) if user else None,
+            )
+        )
+    return result
 
 
 @router.patch(

backend/app/api/v1/milestones.py

@@ -7,7 +7,11 @@ from app.core.deps import get_current_user, get_db_session, require_study_member
 from app.crud import audit as audit_crud
 from app.crud import milestone as milestone_crud
 from app.crud import study as study_crud
+from app.crud import user as user_crud
+from app.crud import site as site_crud
 from app.schemas.milestone import MilestoneCreate, MilestoneRead, MilestoneUpdate
+from app.schemas.user import UserDisplay
+from app.schemas.milestone import SiteDisplay
 
 router = APIRouter()
 
@@ -33,6 +37,12 @@ async def create_milestone(
 ) -> MilestoneRead:
     await _ensure_study_exists(db, study_id)
     milestone = await milestone_crud.create(db, study_id, milestone_in)
+    owner = None
+    site = None
+    if milestone.owner_id:
+        owner = await user_crud.get_by_id(db, milestone.owner_id)
+    if milestone.site_id:
+        site = await site_crud.get_site(db, milestone.site_id)
     await audit_crud.log_action(
         db,
         study_id=study_id,
@@ -43,7 +53,22 @@ async def create_milestone(
         operator_id=current_user.id,
         operator_role=current_user.role,
     )
-    return milestone
+    return MilestoneRead(
+        id=milestone.id,
+        study_id=milestone.study_id,
+        type=milestone.type,
+        name=milestone.name,
+        planned_date=milestone.planned_date,
+        actual_date=milestone.actual_date,
+        status=milestone.status,
+        owner_id=milestone.owner_id,
+        site_id=milestone.site_id,
+        owner=UserDisplay.model_validate(owner) if owner else None,
+        site=SiteDisplay.model_validate(site) if site else None,
+        notes=milestone.notes,
+        created_at=milestone.created_at,
+        updated_at=milestone.updated_at,
+    )
 
 
 @router.get(
@@ -57,7 +82,33 @@ async def list_milestones(
 ) -> list[MilestoneRead]:
     await _ensure_study_exists(db, study_id)
     milestones = await milestone_crud.list_milestones(db, study_id)
-    return list(milestones)
+    owner_ids = {m.owner_id for m in milestones if m.owner_id}
+    site_ids = {m.site_id for m in milestones if m.site_id}
+    users_map = await user_crud.get_users_by_ids(db, owner_ids)
+    sites_map = await site_crud.get_sites_by_ids(db, site_ids)
+    result: list[MilestoneRead] = []
+    for m in milestones:
+        owner = users_map.get(m.owner_id)
+        site = sites_map.get(m.site_id)
+        result.append(
+            MilestoneRead(
+                id=m.id,
+                study_id=m.study_id,
+                type=m.type,
+                name=m.name,
+                planned_date=m.planned_date,
+                actual_date=m.actual_date,
+                status=m.status,
+                owner_id=m.owner_id,
+                site_id=m.site_id,
+                owner=UserDisplay.model_validate(owner) if owner else None,
+                site=SiteDisplay.model_validate(site) if site else None,
+                notes=m.notes,
+                created_at=m.created_at,
+                updated_at=m.updated_at,
+            )
+        )
+    return result
 
 
 @router.patch(
@@ -78,6 +129,12 @@ async def update_milestone(
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Milestone not found")
     old_status = milestone.status
     updated = await milestone_crud.update(db, milestone, milestone_in)
+    owner = None
+    site = None
+    if updated.owner_id:
+        owner = await user_crud.get_by_id(db, updated.owner_id)
+    if updated.site_id:
+        site = await site_crud.get_site(db, updated.site_id)
     detail = None
     if milestone_in.status and milestone_in.status != old_status:
         detail = f"milestone {milestone_id} status {old_status} -> {milestone_in.status}"
@@ -91,4 +148,19 @@ async def update_milestone(
         operator_id=current_user.id,
         operator_role=current_user.role,
     )
-    return updated
+    return MilestoneRead(
+        id=updated.id,
+        study_id=updated.study_id,
+        type=updated.type,
+        name=updated.name,
+        planned_date=updated.planned_date,
+        actual_date=updated.actual_date,
+        status=updated.status,
+        owner_id=updated.owner_id,
+        site_id=updated.site_id,
+        owner=UserDisplay.model_validate(owner) if owner else None,
+        site=SiteDisplay.model_validate(site) if site else None,
+        notes=updated.notes,
+        created_at=updated.created_at,
+        updated_at=updated.updated_at,
+    )

backend/app/api/v1/tasks.py

@@ -8,7 +8,9 @@ from app.crud import audit as audit_crud
 from app.crud import milestone as milestone_crud
 from app.crud import study as study_crud
 from app.crud import task as task_crud
+from app.crud import user as user_crud
 from app.schemas.task import TaskCreate, TaskRead, TaskUpdate
+from app.schemas.user import UserDisplay
 
 router = APIRouter()
 
@@ -47,6 +49,9 @@ async def create_task(
     await _ensure_study_exists(db, study_id)
     await _validate_milestone(db, study_id, task_in.milestone_id)
     task = await task_crud.create(db, study_id, task_in, created_by=current_user.id)
+    assignee = None
+    if task.assignee_id:
+        assignee = await user_crud.get_by_id(db, task.assignee_id)
     await audit_crud.log_action(
         db,
         study_id=study_id,
@@ -57,7 +62,7 @@ async def create_task(
         operator_id=current_user.id,
         operator_role=current_user.role,
     )
-    return task
+    return _to_task_read(task, assignee)
 
 
 @router.get(
@@ -74,7 +79,13 @@ async def list_tasks(
 ) -> list[TaskRead]:
     await _ensure_study_exists(db, study_id)
     tasks = await task_crud.list_tasks(db, study_id, milestone_id=milestone_id, assignee_id=assignee_id, status=status)
-    return list(tasks)
+    assignee_ids = {t.assignee_id for t in tasks if t.assignee_id}
+    users_map = await user_crud.get_users_by_ids(db, assignee_ids)
+    result: list[TaskRead] = []
+    for t in tasks:
+        user = users_map.get(t.assignee_id)
+        result.append(_to_task_read(t, user))
+    return result
 
 
 @router.patch(
@@ -98,6 +109,9 @@ async def update_task(
 
     old_status = task.status
     updated = await task_crud.update(db, task, task_in)
+    assignee = None
+    if updated.assignee_id:
+        assignee = await user_crud.get_by_id(db, updated.assignee_id)
     detail = None
     if task_in.status and task_in.status != old_status:
         detail = f"task {task_id} status {old_status} -> {task_in.status}"
@@ -111,4 +125,23 @@ async def update_task(
         operator_id=current_user.id,
         operator_role=current_user.role,
     )
-    return updated
+    return _to_task_read(updated, assignee)
+
+
+def _to_task_read(task, assignee) -> TaskRead:
+    return TaskRead(
+        id=task.id,
+        study_id=task.study_id,
+        milestone_id=task.milestone_id,
+        title=task.title,
+        description=task.description,
+        assignee_id=task.assignee_id,
+        assignee=UserDisplay.model_validate(assignee) if assignee else None,
+        priority=task.priority,
+        due_date=task.due_date,
+        status=task.status,
+        completed_at=task.completed_at,
+        created_by=task.created_by,
+        created_at=task.created_at,
+        updated_at=task.updated_at,
+    )

backend/app/crud/milestone.py

@@ -17,6 +17,7 @@ async def create(db: AsyncSession, study_id: uuid.UUID, milestone_in: MilestoneC
         actual_date=None,
         status=milestone_in.status or "NOT_STARTED",
         owner_id=milestone_in.owner_id,
+        site_id=milestone_in.site_id,
         notes=milestone_in.notes,
     )
     db.add(milestone)

backend/app/crud/site.py

@@ -46,3 +46,11 @@ async def list_by_study(db: AsyncSession, study_id: uuid.UUID, skip: int = 0, li
         select(Site).where(Site.study_id == study_id).offset(skip).limit(limit)
     )
     return result.scalars().all()
+
+
+async def get_sites_by_ids(db: AsyncSession, ids: set[uuid.UUID]) -> dict[uuid.UUID, Site]:
+    if not ids:
+        return {}
+    result = await db.execute(select(Site).where(Site.id.in_(ids)))
+    sites = result.scalars().all()
+    return {s.id: s for s in sites}

backend/app/crud/user.py

@@ -73,6 +73,14 @@ async def ensure_admin_exists(db: AsyncSession, *, default_password: str = "admi
     await db.commit()
 
 
+async def get_users_by_ids(db: AsyncSession, ids: set[uuid.UUID]) -> dict[uuid.UUID, User]:
+    if not ids:
+        return {}
+    result = await db.execute(select(User).where(User.id.in_(ids)))
+    users = result.scalars().all()
+    return {u.id: u for u in users}
+
+
 async def delete_user(db: AsyncSession, user: User) -> None:
     await db.execute(delete(StudyMember).where(StudyMember.user_id == user.id))
     await db.delete(user)

backend/app/models/milestone.py

@@ -18,6 +18,7 @@ class Milestone(Base):
     planned_date: Mapped[date | None] = mapped_column(Date, nullable=True)
     actual_date: Mapped[date | None] = mapped_column(Date, nullable=True)
     status: Mapped[str] = mapped_column(String(20), nullable=False, default="NOT_STARTED")
+    site_id: Mapped[uuid.UUID | None] = mapped_column(UUID(as_uuid=True), ForeignKey("sites.id"), nullable=True)
     owner_id: Mapped[uuid.UUID | None] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
     notes: Mapped[str | None] = mapped_column(Text, nullable=True)
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, server_default=func.now())

backend/app/schemas/attachment.py

@@ -1,14 +1,17 @@
 import uuid
 from datetime import datetime
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
+
+from app.schemas.user import UserDisplay
 
 
 class AttachmentRead(BaseModel):
     id: uuid.UUID
     filename: str
-    file_size: int
-    uploaded_by: uuid.UUID
+    file_size: int = Field(alias="size")
+    uploaded_by: UserDisplay | None = None
+    uploaded_by_id: uuid.UUID | None = None
     uploaded_at: datetime
 
-    model_config = ConfigDict(from_attributes=True)
+    model_config = ConfigDict(from_attributes=True, populate_by_name=True)

backend/app/schemas/member.py

@@ -3,6 +3,7 @@ from datetime import datetime
 from typing import Literal, Optional
 
 from pydantic import BaseModel, ConfigDict, Field
+from app.schemas.user import UserDisplay
 
 StudyRole = Literal["PM", "CRA", "PV", "IMP", "ADMIN"]
 
@@ -27,3 +28,7 @@ class StudyMemberRead(BaseModel):
     added_at: datetime
 
     model_config = ConfigDict(from_attributes=True)
+
+
+class StudyMemberReadWithUser(StudyMemberRead):
+    user: Optional[UserDisplay] = None

backend/app/schemas/milestone.py

@@ -4,12 +4,21 @@ from typing import Optional
 
 from pydantic import BaseModel, ConfigDict, Field
 
+from app.schemas.user import UserDisplay
+
+
+class SiteDisplay(BaseModel):
+    id: uuid.UUID
+    name: Optional[str] = None
+
+    model_config = ConfigDict(from_attributes=True)
 
 class MilestoneCreate(BaseModel):
     type: str
     name: Optional[str] = None
     planned_date: Optional[date] = None
     owner_id: Optional[uuid.UUID] = None
+    site_id: Optional[uuid.UUID] = None
     notes: Optional[str] = None
     status: str = Field(default="NOT_STARTED")
 
@@ -20,6 +29,7 @@ class MilestoneUpdate(BaseModel):
     actual_date: Optional[date] = None
     status: Optional[str] = None
     owner_id: Optional[uuid.UUID] = None
+    site_id: Optional[uuid.UUID] = None
     notes: Optional[str] = None
 
 
@@ -32,6 +42,9 @@ class MilestoneRead(BaseModel):
     actual_date: Optional[date]
     status: str
     owner_id: Optional[uuid.UUID]
+    site_id: Optional[uuid.UUID] = None
+    owner: Optional[UserDisplay] = None
+    site: Optional[SiteDisplay] = None
     notes: Optional[str]
     created_at: datetime
     updated_at: datetime

backend/app/schemas/task.py

@@ -4,6 +4,8 @@ from typing import Optional
 
 from pydantic import BaseModel, ConfigDict
 
+from app.schemas.user import UserDisplay
+
 
 class TaskCreate(BaseModel):
     milestone_id: Optional[uuid.UUID] = None
@@ -31,6 +33,7 @@ class TaskRead(BaseModel):
     title: str
     description: Optional[str]
     assignee_id: Optional[uuid.UUID]
+    assignee: Optional[UserDisplay] = None
     priority: str
     due_date: Optional[date]
     status: str

backend/app/schemas/user.py

@@ -7,6 +7,14 @@ from pydantic import BaseModel, ConfigDict, Field
 UserRole = Literal["PM", "CRA", "PV", "IMP", "ADMIN"]
 
 
+class UserDisplay(BaseModel):
+  id: uuid.UUID
+  username: str
+  display_name: Optional[str] = None
+
+  model_config = ConfigDict(from_attributes=True)
+
+
 class UserBase(BaseModel):
     username: str = Field(min_length=1)
     role: UserRole