fix: surface active beds on elder records

.trellis/spec/backend/database.md

@@ -202,6 +202,8 @@ export async function getOrdersWithItems(params: {
 
 - `POST /api/admissions`: admit an elder or transfer an active elder to a new available bed.
 - `PATCH /api/admissions/[id]`: discharge an active admission and release its bed.
+- `GET /api/elders`: list elders with current active bed labels joined from `admissions -> beds -> rooms`.
+- `readData()`: compatibility read model must expose the same active bed labels on `Elder.room`, `Elder.bed`, and `Elder.bedId`.
 - Mutations use `getDatabase().transaction(async (transaction) => ...)`.
 
 ### 3. Contracts
@@ -223,8 +225,10 @@ export async function getOrdersWithItems(params: {
 ### 5. Good/Base/Bad Cases
 
 - Good: return a typed mutation result from inside the transaction, then convert it to `jsonFailure` or `jsonSuccess` outside the transaction.
+- Good: display elder bed fields as read-only data derived from the active admission; bed assignment actions live in the bed/admission workspace.
 - Base: read-only admission lists may use the temporary `readData()` compatibility model while the domain helper layer is being extracted.
 - Bad: throw ordinary `Error` for business conflicts such as occupied beds, because it loses the structured status/reason contract.
+- Bad: allow free-text room/bed edits on the elder form when those strings are not persisted relationship data.
 
 ### 6. Tests Required
 

app/api/elders/[id]/route.ts

@@ -119,7 +119,7 @@ export async function DELETE(_request: Request, context: RouteContext): Promise<
     const activeAdmissions = await transaction
       .select()
       .from(admissions)
-      .where(and(eq(admissions.elderId, id), eq(admissions.status, "active")));
+      .where(and(eq(admissions.elderId, id), eq(admissions.organizationId, organizationId), eq(admissions.status, "active")));
 
     await Promise.all(
       activeAdmissions.map((admission) =>
@@ -131,7 +131,10 @@ export async function DELETE(_request: Request, context: RouteContext): Promise<
     );
     await Promise.all(
       activeAdmissions.map((admission) =>
-        transaction.update(beds).set({ status: "available", updatedAt: new Date() }).where(eq(beds.id, admission.bedId)),
+        transaction
+          .update(beds)
+          .set({ status: "available", updatedAt: new Date() })
+          .where(and(eq(beds.id, admission.bedId), eq(beds.organizationId, organizationId))),
       ),
     );
 

app/api/elders/route.ts

@@ -6,11 +6,30 @@ import { jsonFailure, jsonSuccess, readJsonBody } from "@/modules/core/server/ap
 import { recordAuditLog } from "@/modules/core/server/audit";
 import { requirePermission } from "@/modules/core/server/auth";
 import { getDatabase } from "@/modules/core/server/db";
-import { admissions, beds, elders } from "@/modules/core/server/schema";
+import { admissions, beds, elders, rooms } from "@/modules/core/server/schema";
 import { validateElderInput } from "@/modules/elders/types";
 import type { Elder } from "@/modules/elders/types";
 
-function toElder(row: typeof elders.$inferSelect, bedLabel?: { room: string; bed: string; bedId: string }): Elder {
+type ElderRow = typeof elders.$inferSelect;
+type BedLabel = {
+  room: string;
+  bed: string;
+  bedId: string;
+};
+
+type ElderCreateResult =
+  | {
+      success: true;
+      elder: ElderRow;
+      bedLabel?: BedLabel;
+    }
+  | {
+      success: false;
+      reason: string;
+      status: number;
+    };
+
+function toElder(row: ElderRow, bedLabel?: BedLabel): Elder {
   return {
     id: row.id,
     organizationId: row.organizationId,
@@ -46,13 +65,36 @@ export async function GET(): Promise<Response> {
   }
 
   const database = getDatabase();
-  const rows = await database
+  const [rows, activeAdmissionRows] = await Promise.all([
+    database
       .select()
       .from(elders)
       .where(eq(elders.organizationId, organizationId))
-    .orderBy(desc(elders.createdAt));
+      .orderBy(desc(elders.createdAt)),
+    database
+      .select({
+        elderId: admissions.elderId,
+        bedId: admissions.bedId,
+        bedCode: beds.code,
+        roomName: rooms.name,
+      })
+      .from(admissions)
+      .innerJoin(beds, eq(beds.id, admissions.bedId))
+      .innerJoin(rooms, eq(rooms.id, beds.roomId))
+      .where(and(eq(admissions.organizationId, organizationId), eq(admissions.status, "active"))),
+  ]);
+  const bedLabelByElderId = new Map(
+    activeAdmissionRows.map((row) => [
+      row.elderId,
+      {
+        room: row.roomName,
+        bed: row.bedCode,
+        bedId: row.bedId,
+      },
+    ]),
+  );
 
-  return jsonSuccess("老人档案已加载", { elders: rows.map((row) => toElder(row)) });
+  return jsonSuccess("老人档案已加载", { elders: rows.map((row) => toElder(row, bedLabelByElderId.get(row.id))) });
 }
 
 export async function POST(request: Request): Promise<Response> {
@@ -76,7 +118,7 @@ export async function POST(request: Request): Promise<Response> {
   }
 
   const database = getDatabase();
-  const created = await database.transaction(async (transaction) => {
+  const created = await database.transaction(async (transaction): Promise<ElderCreateResult> => {
     const elderId = randomUUID();
     const elderRows = await transaction
       .insert(elders)
@@ -87,7 +129,7 @@ export async function POST(request: Request): Promise<Response> {
         gender: input.data.gender,
         age: input.data.age,
         careLevel: input.data.careLevel,
-        status: input.data.status,
+        status: input.data.bedId ? "active" : input.data.status,
         primaryContact: input.data.primaryContact,
         phone: input.data.phone,
         medicalNotes: input.data.medicalNotes,
@@ -95,21 +137,22 @@ export async function POST(request: Request): Promise<Response> {
       .returning();
     const elder = elderRows[0];
     if (!elder) {
-      throw new Error("老人档案创建失败");
+      return { success: false, reason: "老人档案创建失败", status: 500 };
     }
 
     if (input.data.bedId) {
       const bedRows = await transaction
-        .select()
+        .select({ bed: beds, roomName: rooms.name })
         .from(beds)
+        .innerJoin(rooms, eq(rooms.id, beds.roomId))
         .where(and(eq(beds.id, input.data.bedId), eq(beds.organizationId, organizationId)))
         .limit(1);
-      const bed = bedRows[0];
+      const bedRow = bedRows[0];
-      if (!bed) {
+      if (!bedRow) {
-        throw new Error("床位不存在");
+        return { success: false, reason: "床位不存在", status: 404 };
       }
-      if (bed.status !== "available") {
+      if (bedRow.bed.status !== "available") {
-        throw new Error("床位不可分配");
+        return { success: false, reason: "床位不可分配", status: 409 };
       }
 
       await transaction
@@ -117,17 +160,34 @@ export async function POST(request: Request): Promise<Response> {
         .values({
           organizationId,
           elderId: elder.id,
-          bedId: bed.id,
+          bedId: bedRow.bed.id,
           status: "active",
           notes: "新增档案时办理入住",
         });
-      await transaction.update(beds).set({ status: "occupied", updatedAt: new Date() }).where(eq(beds.id, bed.id));
+      await transaction
+        .update(beds)
+        .set({ status: "occupied", updatedAt: new Date() })
+        .where(and(eq(beds.id, bedRow.bed.id), eq(beds.organizationId, organizationId)));
+
+      return {
+        success: true,
+        elder,
+        bedLabel: {
+          room: bedRow.roomName,
+          bed: bedRow.bed.code,
+          bedId: bedRow.bed.id,
+        },
+      };
     }
 
-    return elder;
+    return { success: true, elder };
   });
 
-  const elder = toElder(created);
+  if (!created.success) {
+    return jsonFailure(created.reason, created.status);
+  }
+
+  const elder = toElder(created.elder, created.bedLabel);
   await recordAuditLog({
     actor: auth.context.account,
     organizationId,

modules/core/server/store.ts

@@ -113,6 +113,19 @@ export async function readData(): Promise<AppData> {
   ]);
 
   const roleById = new Map(membershipRows.map((row) => [row.membership.id, row.role]));
+  const activeAdmissionByElderId = new Map<string, { room: string; bed: string; bedId: string }>();
+  for (const row of admissionRows) {
+    if (row.admission.status !== "active") {
+      continue;
+    }
+
+    activeAdmissionByElderId.set(row.admission.elderId, {
+      room: row.roomName,
+      bed: row.bedCode,
+      bedId: row.admission.bedId,
+    });
+  }
+
   const bedCounts = new Map<string, { total: number; occupied: number }>();
   for (const row of bedRows) {
     const current = bedCounts.get(row.bed.roomId) ?? { total: 0, occupied: 0 };
@@ -209,22 +222,26 @@ export async function readData(): Promise<AppData> {
     expiresAt: iso(row.expiresAt),
   }));
 
-  const eldersData: Elder[] = elderRows.map((row) => ({
+  const eldersData: Elder[] = elderRows.map((row) => {
+    const activeAdmission = activeAdmissionByElderId.get(row.id);
+    return {
       id: row.id,
       organizationId: row.organizationId,
       name: row.name,
       gender: row.gender,
       age: row.age,
       careLevel: row.careLevel,
-    room: "",
+      room: activeAdmission?.room ?? "",
-    bed: "",
+      bed: activeAdmission?.bed ?? "",
+      bedId: activeAdmission?.bedId,
       status: row.status,
       primaryContact: row.primaryContact,
       phone: row.phone,
       medicalNotes: row.medicalNotes,
       createdAt: iso(row.createdAt),
       updatedAt: iso(row.updatedAt),
-  }));
+    };
+  });
 
   const roomsData: Room[] = roomRows.map((row) => {
     const counts = bedCounts.get(row.id) ?? { total: 0, occupied: 0 };

modules/elders/components/EldersClient.tsx

@@ -56,6 +56,10 @@ function formatDateTime(value: string): string {
   return new Date(value).toLocaleString("zh-CN");
 }
 
+function formatBedLabel(elder: Pick<Elder, "room" | "bed">): string {
+  return elder.room && elder.bed ? `${elder.room}-${elder.bed}` : "-";
+}
+
 function getRiskLabel(elder: Elder): { label: string; variant: "danger" | "warning" | "success" } {
   if (elder.careLevel === "intensive") {
     return { label: "红色重点", variant: "danger" };
@@ -136,6 +140,7 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
   const safePage = Math.min(page, pageCount);
   const pageStart = (safePage - 1) * PAGE_SIZE;
   const visibleElders = filteredElders.slice(pageStart, pageStart + PAGE_SIZE);
+  const editingElder = editingId ? elders.find((elder) => elder.id === editingId) : undefined;
 
   function updateField<K extends keyof ElderInput>(key: K, value: ElderInput[K]): void {
     setForm((current) => ({ ...current, [key]: value }));
@@ -359,9 +364,7 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
                         </p>
                       </Table.Cell>
                       <Table.Cell className="px-4 py-3">{CARE_LEVEL_LABELS[elder.careLevel]}</Table.Cell>
-                      <Table.Cell className="px-4 py-3 text-muted-foreground">
+                      <Table.Cell className="px-4 py-3 text-muted-foreground">{formatBedLabel(elder)}</Table.Cell>
-                        {elder.room}-{elder.bed}
-                      </Table.Cell>
                       <Table.Cell className="px-4 py-3 text-muted-foreground">
                         {elder.primaryContact} / {elder.phone}
                       </Table.Cell>
@@ -490,16 +493,11 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
               />
             </div>
           </div>
-          <div className="grid gap-3 sm:grid-cols-2">
+          {isEditing ? (
-            <label className="grid gap-1.5 text-sm font-medium">
+            <div className="rounded-md border bg-secondary/30 px-3 py-2 text-sm">
-              房间
+              当前床位：{editingElder ? formatBedLabel(editingElder) : "-"}
-              <Input value={form.room} onChange={(event) => updateField("room", event.target.value)} />
-            </label>
-            <label className="grid gap-1.5 text-sm font-medium">
-              床位
-              <Input value={form.bed} onChange={(event) => updateField("bed", event.target.value)} />
-            </label>
             </div>
+          ) : null}
           <label className="grid gap-1.5 text-sm font-medium">
             联系人
             <Input value={form.primaryContact} onChange={(event) => updateField("primaryContact", event.target.value)} />
@@ -543,7 +541,7 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
         <div className="flex flex-col gap-4">
           {deleteTarget ? (
             <div className="rounded-md border border-red-200 bg-red-50 p-3 text-sm text-red-700">
-              {deleteTarget.name}，{deleteTarget.room}-{deleteTarget.bed}，最近更新：
+              {deleteTarget.name}，{formatBedLabel(deleteTarget)}，最近更新：
               {formatDateTime(deleteTarget.updatedAt)}
             </div>
           ) : null}