fix: surface active beds on elder records

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
-    .select()
-    .from(elders)
-    .where(eq(elders.organizationId, organizationId))
-    .orderBy(desc(elders.createdAt));
+  const [rows, activeAdmissionRows] = await Promise.all([
+    database
+      .select()
+      .from(elders)
+      .where(eq(elders.organizationId, organizationId))
+      .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];
-      if (!bed) {
-        throw new Error("床位不存在");
+      const bedRow = bedRows[0];
+      if (!bedRow) {
+        return { success: false, reason: "床位不存在", status: 404 };
       }
-      if (bed.status !== "available") {
-        throw new Error("床位不可分配");
+      if (bedRow.bed.status !== "available") {
+        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,