Merge remote-tracking branch 'origin/develop' into develop

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 || ''