From a894f0f8ee7592526e0939f7f9718884e735e0a9 Mon Sep 17 00:00:00 2001
From: yangkexiang <1677036288@qq.com>
Date: Wed, 8 Apr 2026 17:50:51 +0800
Subject: [PATCH] =?UTF-8?q?bug320:=20=E6=89=8B=E6=9C=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E3=80=8B=E9=97=A8=E8=AF=8A=E6=89=8B=E6=9C=AF=E5=AE=89=E6=8E=92?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=AF=E5=AE=89=E6=8E=92?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E5=B0=B1=E8=AF=8A=E5=8D=A1=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/surgery/surgeryApplication.vue            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
index 4a59605b..a3a434af 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
@@ -733,10 +733,15 @@ function handleAdd() {
   // 自动填充患者信息
   form.value.patientId = props.patientInfo.patientId
   form.value.encounterId = props.patientInfo.encounterId
-  form.value.encounterNo = props.patientInfo.busNo
+  form.value.encounterNo = props.patientInfo.identifierNo
   form.value.patientName = props.patientInfo.patientName
   form.value.patientGender = props.patientInfo.genderEnum_enumText
-  form.value.patientAge = props.patientInfo.age
+  // el-input-number 只接受 number；age 可能是 "12" / "12岁"
+  const rawAge = props.patientInfo.age
+  const parsedAge = rawAge === null || rawAge === undefined
+    ? undefined
+    : Number.parseInt(String(rawAge).replace(/[^\d]/g, ''), 10)
+  form.value.patientAge = Number.isFinite(parsedAge) ? parsedAge : undefined
   form.value.applyDoctorName = userStore.nickName
   form.value.applyDeptName = userStore.orgName || props.patientInfo.deptName || ''