fix: require explicit business form choices

modules/elders/components/EldersClient.tsx

@@ -20,14 +20,21 @@ type EldersClientProps = {
   permissions: Permission[];
 };
 
-const emptyInput: ElderInput = {
+type ElderFormState = Omit<ElderInput, "age" | "careLevel" | "gender" | "status"> & {
+  age: string;
+  careLevel: CareLevel | "";
+  gender: ElderInput["gender"] | "";
+  status: ElderStatus | "";
+};
+
+const emptyInput: ElderFormState = {
   name: "",
-  gender: "male",
+  gender: "",
-  age: 75,
+  age: "",
-  careLevel: "self-care",
+  careLevel: "",
   room: "",
   bed: "",
-  status: "active",
+  status: "",
   primaryContact: "",
   phone: "",
   medicalNotes: "",
@@ -37,11 +44,11 @@ const PAGE_SIZE = 8;
 const ALL_STATUS = "all";
 const ALL_CARE_LEVELS = "all";
 
-function elderToInput(elder: Elder): ElderInput {
+function elderToInput(elder: Elder): ElderFormState {
   return {
     name: elder.name,
     gender: elder.gender,
-    age: elder.age,
+    age: String(elder.age),
     careLevel: elder.careLevel,
     room: elder.room,
     bed: elder.bed,
@@ -60,18 +67,6 @@ 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" };
-  }
-
-  if (elder.status === "pending" || elder.careLevel === "assisted") {
-    return { label: "黄色关注", variant: "warning" };
-  }
-
-  return { label: "绿色稳定", variant: "success" };
-}
-
 const statusOptions = [
   { value: ALL_STATUS, label: "全部状态" },
   ...Object.entries(ELDER_STATUS_LABELS).map(([value, label]) => ({ value, label })),
@@ -82,9 +77,18 @@ const careLevelOptions = [
   ...Object.entries(CARE_LEVEL_LABELS).map(([value, label]) => ({ value, label })),
 ];
 
-const genderOptions = Object.entries(GENDER_LABELS).map(([value, label]) => ({ value, label }));
+const genderOptions = [
-const formCareLevelOptions = Object.entries(CARE_LEVEL_LABELS).map(([value, label]) => ({ value, label }));
+  { value: "", label: "选择性别", disabled: true },
-const formStatusOptions = Object.entries(ELDER_STATUS_LABELS).map(([value, label]) => ({ value, label }));
+  ...Object.entries(GENDER_LABELS).map(([value, label]) => ({ value, label })),
+];
+const formCareLevelOptions = [
+  { value: "", label: "选择护理等级", disabled: true },
+  ...Object.entries(CARE_LEVEL_LABELS).map(([value, label]) => ({ value, label })),
+];
+const formStatusOptions = [
+  { value: "", label: "选择档案状态", disabled: true },
+  ...Object.entries(ELDER_STATUS_LABELS).map(([value, label]) => ({ value, label })),
+];
 
 function matchesFilters(
   elder: Elder,
@@ -108,7 +112,7 @@ function matchesFilters(
 export function EldersClient({ initialElders, permissions }: EldersClientProps): React.ReactElement {
   const [elders, setElders] = useState(initialElders);
   const [editingId, setEditingId] = useState<string | null>(null);
-  const [form, setForm] = useState<ElderInput>(emptyInput);
+  const [form, setForm] = useState<ElderFormState>(emptyInput);
   const [message, setMessage] = useState("");
   const [isPending, setIsPending] = useState(false);
   const [isFormOpen, setIsFormOpen] = useState(false);
@@ -125,11 +129,11 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
   const canSubmit = isEditing ? canUpdate : canCreate;
 
   const metrics = useMemo(() => {
+    const totalCount = elders.length;
     const activeCount = elders.filter((elder) => elder.status === "active").length;
     const pendingCount = elders.filter((elder) => elder.status === "pending").length;
-    const intensiveCount = elders.filter((elder) => elder.careLevel === "intensive").length;
+    const dischargedCount = elders.filter((elder) => elder.status === "discharged").length;
-    const warningCount = elders.filter((elder) => getRiskLabel(elder).variant !== "success").length;
+    return { activeCount, dischargedCount, pendingCount, totalCount };
-    return { activeCount, pendingCount, intensiveCount, warningCount };
   }, [elders]);
 
   const filteredElders = useMemo(
@@ -142,7 +146,7 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
   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 {
+  function updateField<K extends keyof ElderFormState>(key: K, value: ElderFormState[K]): void {
     setForm((current) => ({ ...current, [key]: value }));
   }
 
@@ -203,10 +207,31 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
     setIsPending(true);
     setMessage("");
 
+    if (!form.gender || !form.careLevel || !form.status) {
+      setIsPending(false);
+      setMessage("请完整选择性别、护理等级和档案状态");
+      return;
+    }
+
+    const numericAge = Number(form.age);
+    if (!Number.isInteger(numericAge) || numericAge < 0 || numericAge > 130) {
+      setIsPending(false);
+      setMessage("年龄需为0到130之间的整数");
+      return;
+    }
+
+    const payload: ElderInput = {
+      ...form,
+      age: numericAge,
+      careLevel: form.careLevel,
+      gender: form.gender,
+      status: form.status,
+    };
+
     const response = await fetch(isEditing ? `/api/elders/${editingId}` : "/api/elders", {
       method: isEditing ? "PATCH" : "POST",
       headers: { "content-type": "application/json" },
-      body: JSON.stringify(form),
+      body: JSON.stringify(payload),
     });
     const result = (await response.json()) as ApiResult<{ elder: Elder }>;
     setIsPending(false);
@@ -269,7 +294,13 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
       <section className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
         <Card>
           <CardHeader className="p-4">
-            <CardDescription>在院老人</CardDescription>
+            <CardDescription>档案总数</CardDescription>
+            <CardTitle className="text-3xl">{metrics.totalCount}</CardTitle>
+          </CardHeader>
+        </Card>
+        <Card>
+          <CardHeader className="p-4">
+            <CardDescription>在院</CardDescription>
             <CardTitle className="text-3xl">{metrics.activeCount}</CardTitle>
           </CardHeader>
         </Card>
@@ -279,16 +310,10 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
             <CardTitle className="text-3xl">{metrics.pendingCount}</CardTitle>
           </CardHeader>
         </Card>
-        <Card className="border-red-200 bg-red-50/70">
-          <CardHeader className="p-4">
-            <CardDescription className="text-red-700">红色重点</CardDescription>
-            <CardTitle className="text-3xl text-red-700">{metrics.intensiveCount}</CardTitle>
-          </CardHeader>
-        </Card>
         <Card>
           <CardHeader className="p-4">
-            <CardDescription>需关注标记</CardDescription>
+            <CardDescription>已退住</CardDescription>
-            <CardTitle className="text-3xl">{metrics.warningCount}</CardTitle>
+            <CardTitle className="text-3xl">{metrics.dischargedCount}</CardTitle>
           </CardHeader>
         </Card>
       </section>
@@ -347,15 +372,11 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
                   <Table.Head className="px-4 py-3 font-medium">床位</Table.Head>
                   <Table.Head className="px-4 py-3 font-medium">联系人</Table.Head>
                   <Table.Head className="px-4 py-3 font-medium">状态</Table.Head>
-                  <Table.Head className="px-4 py-3 font-medium">标记</Table.Head>
                   <Table.Head className="px-4 py-3 text-right font-medium">操作</Table.Head>
                 </Table.Row>
               </Table.Header>
               <Table.Body className="divide-y bg-card">
-                {visibleElders.map((elder) => {
+                {visibleElders.map((elder) => (
-                  const risk = getRiskLabel(elder);
-
-                  return (
                   <Table.Row key={elder.id}>
                     <Table.Cell className="px-4 py-3">
                       <p className="font-medium">{elder.name}</p>
@@ -373,9 +394,6 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
                         {ELDER_STATUS_LABELS[elder.status]}
                       </Badge>
                     </Table.Cell>
-                      <Table.Cell className="px-4 py-3">
-                        <Badge variant={risk.variant}>{risk.label}</Badge>
-                      </Table.Cell>
                     <Table.Cell className="px-4 py-3">
                       <div className="flex justify-end gap-2">
                         <Button
@@ -401,11 +419,10 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
                       </div>
                     </Table.Cell>
                   </Table.Row>
-                  );
+                ))}
-                })}
                 {visibleElders.length === 0 ? (
                   <Table.Row>
-                    <Table.Cell className="px-4 py-8 text-center text-muted-foreground" colSpan={7}>
+                    <Table.Cell className="px-4 py-8 text-center text-muted-foreground" colSpan={6}>
                       暂无匹配老人档案
                     </Table.Cell>
                   </Table.Row>
@@ -457,8 +474,9 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
               性别
               <Select
                 aria-label="性别"
-                onValueChange={(value) => updateField("gender", value as ElderInput["gender"])}
+                onValueChange={(value) => updateField("gender", value as ElderFormState["gender"])}
                 options={genderOptions}
+                required
                 value={form.gender}
               />
             </div>
@@ -467,7 +485,8 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
               <Input
                 max={130}
                 min={0}
-                onChange={(event) => updateField("age", Number(event.target.value))}
+                onChange={(event) => updateField("age", event.target.value)}
+                required
                 type="number"
                 value={form.age}
               />
@@ -478,8 +497,9 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
               护理等级
               <Select
                 aria-label="护理等级"
-                onValueChange={(value) => updateField("careLevel", value as ElderInput["careLevel"])}
+                onValueChange={(value) => updateField("careLevel", value as ElderFormState["careLevel"])}
                 options={formCareLevelOptions}
+                required
                 value={form.careLevel}
               />
             </div>
@@ -487,8 +507,9 @@ export function EldersClient({ initialElders, permissions }: EldersClientProps):
               状态
               <Select
                 aria-label="状态"
-                onValueChange={(value) => updateField("status", value as ElderInput["status"])}
+                onValueChange={(value) => updateField("status", value as ElderFormState["status"])}
                 options={formStatusOptions}
+                required
                 value={form.status}
               />
             </div>

modules/settings/components/OrganizationInviteDialog.tsx

@@ -36,7 +36,6 @@ export function OrganizationInviteDialog({
     () => roles.filter((role) => role.scope === "organization" && role.organizationId === organization.id && role.isEnabled),
     [organization.id, roles],
   );
-  const defaultRoleId = organizationRoles.find((role) => role.key === "caregiver")?.id ?? organizationRoles[0]?.id ?? "";
 
   function closeDialog(): void {
     if (isPending) {
@@ -52,14 +51,20 @@ export function OrganizationInviteDialog({
     event.preventDefault();
     setMessage("");
     setLastInviteHref("");
-    setIsPending(true);
     const formData = new FormData(event.currentTarget);
+    const roleId = String(formData.get("roleId") ?? "");
+    if (!roleId) {
+      setMessage("请选择邀请角色");
+      return;
+    }
+
+    setIsPending(true);
     const response = await fetch(`/api/organizations/${organization.id}/invitations`, {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify({
         email: String(formData.get("email") ?? ""),
-        roleId: String(formData.get("roleId") ?? ""),
+        roleId,
       }),
     });
     const result = (await response.json()) as ApiResult<{ invitation: OrganizationInvitation }>;
@@ -94,11 +99,14 @@ export function OrganizationInviteDialog({
           <span className="font-medium">角色</span>
           <Select
             aria-label="邀请角色"
-            defaultValue={defaultRoleId}
+            defaultValue=""
             disabled={organizationRoles.length === 0}
             key={organization.id}
             name="roleId"
-            options={organizationRoles.map((role) => ({ value: role.id, label: role.label }))}
+            options={[
+              { value: "", label: "选择邀请角色", disabled: true },
+              ...organizationRoles.map((role) => ({ value: role.id, label: role.label })),
+            ]}
             required
           />
         </label>
@@ -125,7 +133,7 @@ export function OrganizationInviteDialog({
           <Button disabled={isPending} onClick={closeDialog} type="button" variant="outline">
             取消
           </Button>
-          <Button disabled={isPending || !defaultRoleId} type="submit">
+          <Button disabled={isPending || organizationRoles.length === 0} type="submit">
             <Send className="size-4" aria-hidden="true" />
             生成邀请
           </Button>

modules/settings/components/UserManagementClient.tsx

@@ -24,10 +24,6 @@ function getOrganizationRoles(roles: RoleDefinition[], organizationId: string):
   return roles.filter((role) => role.scope === "organization" && role.organizationId === organizationId && role.isEnabled);
 }
 
-function getDefaultOrganizationId(organizations: Organization[]): string {
-  return organizations[0]?.id ?? "";
-}
-
 export function UserManagementClient({
   canManageAccounts = false,
   organizations,
@@ -36,7 +32,7 @@ export function UserManagementClient({
 }: UserManagementClientProps): React.ReactElement {
   const router = useRouter();
   const [isCreateOpen, setIsCreateOpen] = useState(false);
-  const [selectedOrganizationId, setSelectedOrganizationId] = useState(() => getDefaultOrganizationId(organizations));
+  const [selectedOrganizationId, setSelectedOrganizationId] = useState("");
   const [reviewRoleByRequestId, setReviewRoleByRequestId] = useState<Record<string, string>>({});
   const [message, setMessage] = useState("");
   const [isPending, setIsPending] = useState(false);
@@ -68,15 +64,22 @@ export function UserManagementClient({
     }
 
     setMessage("");
-    setIsPending(true);
 
     const formData = new FormData(event.currentTarget);
+    const organizationId = String(formData.get("organizationId") ?? "");
+    const roleId = String(formData.get("roleId") ?? "");
+    if (!organizationId || !roleId) {
+      setMessage("请选择机构和角色");
+      return;
+    }
+
+    setIsPending(true);
     const response = await fetch("/api/settings/accounts", {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify({
-        organizationId: String(formData.get("organizationId") ?? ""),
+        organizationId,
-        roleId: String(formData.get("roleId") ?? ""),
+        roleId,
         name: String(formData.get("name") ?? ""),
         email: String(formData.get("email") ?? ""),
         avatarUrl: String(formData.get("avatarUrl") ?? ""),
@@ -170,8 +173,7 @@ export function UserManagementClient({
         <CardContent className="space-y-3">
           {pendingJoinRequests.map((request) => {
             const requestRoles = getOrganizationRoles(roles, request.organizationId);
-            const defaultRoleId = requestRoles.find((role) => role.key === "caregiver")?.id ?? requestRoles[0]?.id ?? "";
+            const selectedRoleId = reviewRoleByRequestId[request.id] ?? "";
-            const selectedRoleId = reviewRoleByRequestId[request.id] ?? defaultRoleId;
 
             return (
               <div key={request.id} className="rounded-md border p-3">
@@ -190,7 +192,10 @@ export function UserManagementClient({
                     onValueChange={(roleId) =>
                       setReviewRoleByRequestId((current) => ({ ...current, [request.id]: roleId }))
                     }
-                    options={requestRoles.map((role) => ({ value: role.id, label: role.label }))}
+                    options={[
+                      { value: "", label: "选择审批角色", disabled: true },
+                      ...requestRoles.map((role) => ({ value: role.id, label: role.label })),
+                    ]}
                     value={selectedRoleId}
                   />
                   <Button
@@ -233,7 +238,11 @@ export function UserManagementClient({
               aria-label="机构"
               name="organizationId"
               onValueChange={setSelectedOrganizationId}
-              options={organizations.map((organization) => ({ value: organization.id, label: organization.name }))}
+              options={[
+                { value: "", label: "选择机构", disabled: true },
+                ...organizations.map((organization) => ({ value: organization.id, label: organization.name })),
+              ]}
+              required
               value={selectedOrganizationId}
             />
           </label>
@@ -242,11 +251,14 @@ export function UserManagementClient({
             <span className="font-medium">角色</span>
             <Select
               aria-label="角色"
-              defaultValue={organizationRoles[0]?.id ?? ""}
+              defaultValue=""
               disabled={organizationRoles.length === 0}
               key={selectedOrganizationId}
               name="roleId"
-              options={organizationRoles.map((role) => ({ value: role.id, label: role.label }))}
+              options={[
+                { value: "", label: selectedOrganizationId ? "选择角色" : "先选择机构", disabled: true },
+                ...organizationRoles.map((role) => ({ value: role.id, label: role.label })),
+              ]}
               required
             />
           </label>
@@ -303,17 +315,14 @@ export function UserAccountActions({
 }: UserAccountActionsProps): React.ReactElement {
   const router = useRouter();
   const [isEditOpen, setIsEditOpen] = useState(false);
-  const [selectedOrganizationId, setSelectedOrganizationId] = useState(
+  const [selectedOrganizationId, setSelectedOrganizationId] = useState(() => account.organizationId ?? "");
-    () => account.organizationId ?? getDefaultOrganizationId(organizations),
-  );
   const [message, setMessage] = useState("");
   const [isPending, setIsPending] = useState(false);
   const organizationRoles = useMemo(
     () => getOrganizationRoles(roles, selectedOrganizationId),
     [roles, selectedOrganizationId],
   );
-  const defaultRoleId =
+  const defaultRoleId = organizationRoles.find((role) => role.key === account.role || role.id === account.role)?.id ?? "";
-    organizationRoles.find((role) => role.key === account.role || role.id === account.role)?.id ?? organizationRoles[0]?.id ?? "";
   const isCurrentAccount = account.id === currentAccountId;
 
   async function updateAccount(payload: Record<string, string>): Promise<void> {
@@ -430,7 +439,10 @@ export function UserAccountActions({
                 aria-label="账号机构"
                 name="organizationId"
                 onValueChange={setSelectedOrganizationId}
-                options={organizations.map((organization) => ({ value: organization.id, label: organization.name }))}
+                options={[
+                  { value: "", label: "选择机构", disabled: true },
+                  ...organizations.map((organization) => ({ value: organization.id, label: organization.name })),
+                ]}
                 value={selectedOrganizationId}
               />
             </label>
@@ -442,7 +454,10 @@ export function UserAccountActions({
                 disabled={organizationRoles.length === 0}
                 key={selectedOrganizationId}
                 name="roleId"
-                options={organizationRoles.map((role) => ({ value: role.id, label: role.label }))}
+                options={[
+                  { value: "", label: selectedOrganizationId ? "选择角色" : "先选择机构", disabled: true },
+                  ...organizationRoles.map((role) => ({ value: role.id, label: role.label })),
+                ]}
               />
             </label>
           </div>