From 7e852e2be64995b5883c4504b519fceeb5533c58 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Sat, 20 Jun 2026 15:40:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(mobile):=20=E4=BF=AE=E5=A4=8D=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91=E8=81=94=E5=8A=A8=20-=20encounterId?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E4=BC=A0=E9=80=92+=E6=82=A3=E8=80=85?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 healthlink-his-mobile/src/views/AssessmentForm.vue | 3 ++-
 healthlink-his-mobile/src/views/PatientDetail.vue  | 9 +++++----
 healthlink-his-mobile/src/views/PatientList.vue    | 2 +-
 healthlink-his-mobile/src/views/VitalSignEntry.vue | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/healthlink-his-mobile/src/views/AssessmentForm.vue b/healthlink-his-mobile/src/views/AssessmentForm.vue
index e52853aaf..6066bb2d4 100644
--- a/healthlink-his-mobile/src/views/AssessmentForm.vue
+++ b/healthlink-his-mobile/src/views/AssessmentForm.vue
@@ -59,7 +59,8 @@ const riskLevelText = computed(() => ({ HIGH: '高风险', MEDIUM: '中风险',
 const submit = async () => {
   submitting.value = true
   try {
-    await nursingApi.submitAssessment({ patientId: route.params.patientId, assessmentType: selectedType.value, totalScore: totalScore.value, riskLevel: riskLevel.value, detail: JSON.stringify(formData.value) })
+    const encounterId = route.query.encounterId
+    await nursingApi.submitAssessment({ patientId: route.params.patientId, encounterId: encounterId || undefined, assessmentType: selectedType.value, totalScore: totalScore.value, riskLevel: riskLevel.value, detail: JSON.stringify(formData.value) })
     ElMessage.success('评估提交成功')
   } catch (e) { ElMessage.error('提交失败') } finally { submitting.value = false }
 }
diff --git a/healthlink-his-mobile/src/views/PatientDetail.vue b/healthlink-his-mobile/src/views/PatientDetail.vue
index b6ef30234..4d76aeff4 100644
--- a/healthlink-his-mobile/src/views/PatientDetail.vue
+++ b/healthlink-his-mobile/src/views/PatientDetail.vue
@@ -81,12 +81,13 @@ const formatTime = (t) => { if (!t) return ''; const d = new Date(t); return `${
 
 onMounted(async () => {
   const id = route.params.id
+  const encounterId = route.query.encounterId
   try {
     const [pRes, oRes, vRes, aRes] = await Promise.allSettled([
       nursingApi.getPatientInfo(id),
-      nursingApi.getOrders(id),
+      encounterId ? nursingApi.getOrders(encounterId) : Promise.resolve({ data: [] }),
       nursingApi.getVitalSigns(id),
-      nursingApi.getAssessments(id)
+      encounterId ? nursingApi.getAssessments(encounterId) : Promise.resolve({ data: [] })
     ])
     if (pRes.status === 'fulfilled') patient.value = pRes.value?.data || {}
     if (oRes.status === 'fulfilled') orders.value = oRes.value?.data?.records || oRes.value?.data || []
@@ -98,8 +99,8 @@ onMounted(async () => {
 const executeOrder = async (order) => {
   try { await nursingApi.completeTask(order.id || order.adviceId, { result: '执行完成' }); ElMessage.success('医嘱已执行'); order.executeStatus = '已执行' } catch (e) { ElMessage.error('执行失败') }
 }
-const goVitalEntry = () => router.push(`/mobile/vital-entry/${route.params.id}`)
-const goAssessment = () => router.push(`/mobile/assessment/${route.params.id}`)
+const goVitalEntry = () => router.push(`/mobile/vital-entry/${route.params.id}?encounterId=${route.query.encounterId || ''}`)
+const goAssessment = () => router.push(`/mobile/assessment/${route.params.id}?encounterId=${route.query.encounterId || ''}`)
 </script>
 
 <style scoped>
diff --git a/healthlink-his-mobile/src/views/PatientList.vue b/healthlink-his-mobile/src/views/PatientList.vue
index 82de476f4..8184430b8 100644
--- a/healthlink-his-mobile/src/views/PatientList.vue
+++ b/healthlink-his-mobile/src/views/PatientList.vue
@@ -53,7 +53,7 @@ const loadPatients = async (reset = false) => {
 
 const onSearch = () => { loadPatients(true) }
 const loadMore = () => { pageNo.value++; loadPatients(false) }
-const goDetail = (p) => { router.push(`/mobile/patient-detail/${p.patientId || p.id}`) }
+const goDetail = (p) => { router.push(`/mobile/patient-detail/${p.patientId || p.id}?encounterId=${p.encounterId || ''}`) }
 
 onMounted(() => loadPatients(true))
 </script>
diff --git a/healthlink-his-mobile/src/views/VitalSignEntry.vue b/healthlink-his-mobile/src/views/VitalSignEntry.vue
index 5138b31c5..463c0f02a 100644
--- a/healthlink-his-mobile/src/views/VitalSignEntry.vue
+++ b/healthlink-his-mobile/src/views/VitalSignEntry.vue
@@ -50,7 +50,8 @@ const painLabel = computed(() => { const s = formData.value.painScore; return s
 const submit = async () => {
   submitting.value = true
   try {
-    await nursingApi.submitVitalSign({ ...formData.value, patientId: route.params.patientId })
+    const encounterId = route.query.encounterId
+    await nursingApi.submitVitalSign({ ...formData.value, patientId: route.params.patientId, encounterId: encounterId || undefined })
     ElMessage.success('体征录入成功')
   } catch (e) { ElMessage.error('提交失败') } finally { submitting.value = false }
 }