From 0daeb03e625ef6cff4e57b427c4859e2bdaea5ca Mon Sep 17 00:00:00 2001
From: yuchenglong <yclworks@gmail.com>
Date: Tue, 9 Dec 2025 14:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0=E6=82=A3?=
 =?UTF-8?q?=E8=80=85=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=AD=A3=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?=
 =?UTF-8?q?=E7=A0=81=E8=A7=A3=E6=9E=90=E5=87=BD=E6=95=B0=E7=9A=84=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E4=BB=A3=E7=A0=81=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hisApi.ts   | 39 ++++++++++++---------------------------
 src/utils/idCard.ts | 10 +++++-----
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/api/hisApi.ts b/src/api/hisApi.ts
index 61c84c9..f26323b 100644
--- a/src/api/hisApi.ts
+++ b/src/api/hisApi.ts
@@ -184,33 +184,18 @@ export async function updatePatientInfo(
   address?: string,
   id_no_pic?: File | Blob
 ): Promise<ApiResponse<null>> {
-  // 如果包含图片文件，使用 multipart/form-data 上传
-  if (id_no_pic) {
-    const formData = new FormData();
-    formData.append("id_no", id_no);
-    formData.append("marital_status", marital_status.toString());
-    formData.append("province", province || "");
-    formData.append("city", city || "");
-    formData.append("county", county || "");
-    formData.append("address", address || "");
-    formData.append("id_no_pic", id_no_pic);
-
-    const response = await axiosInstance.post<ApiResponse<null>>(
-      "patient-edit",
-      formData
-    );
-    return response.data;
-  }
-
-  // 否则以 JSON 方式提交
-  const response = await axiosInstance.post<ApiResponse<null>>("patient-edit", {
-    id_no,
-    marital_status,
-    province: province || "",
-    city: city || "",
-    county: county || "",
-    address: address || "",
-  });
+  const formData = new FormData();
+  formData.append("id_no", id_no);
+  formData.append("id_no_pic", id_no_pic || "");
+  formData.append("marital_status", marital_status.toString());
+  formData.append("province", province || "");
+  formData.append("city", city || "");
+  formData.append("county", county || "");
+  formData.append("address", address || "");
+  const response = await axiosInstance.post<ApiResponse<null>>(
+    "patient-edit",
+    formData
+  );
   return response.data;
 }
 
diff --git a/src/utils/idCard.ts b/src/utils/idCard.ts
index ce3f486..0c58ec3 100644
--- a/src/utils/idCard.ts
+++ b/src/utils/idCard.ts
@@ -4,11 +4,11 @@ export function parseRegionCodesFromId(idNo: string | null | undefined) {
   const s = String(idNo).trim();
   // 身份证号码前6位为行政区划代码
   if (!/^[0-9]{6,}/.test(s)) return result;
-  const first6 = s.slice(4, 6);
-  const first4 = s.slice(2, 4);
+  const first6 = s.slice(0, 6);
+  const first4 = s.slice(0, 4);
   const first2 = s.slice(0, 2);
-  result.county = first6;
-  result.city = `${first4}`;
-  result.province = `${first2}`;
+  result.county = first6; // 6位县级代码
+  result.city = `${first4}`; // 市级代码：前4位+00
+  result.province = `${first2}`; // 省级代码：前2位+0000
   return result;
 }