From 3e416d46641c238d7fe0085a1834da66847d59bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com>
Date: Tue, 12 May 2026 17:05:17 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#400:=20=E9=97=A8=E8=AF=8A=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E7=AB=99=E7=82=B9=E5=87=BB=E3=80=90=E5=AE=8C=E8=AF=8A?=
 =?UTF-8?q?=E3=80=91=E5=90=8E=EF=BC=8Ctriage=5Fqueue=5Fitem=20=E8=A1=A8=20?=
 =?UTF-8?q?status=20=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=8C=89=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BA=2030?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

完诊API后端要求同时传递 encounterId 和 firstEnum 两个参数：
1. DoctorCallDialog.vue：已有修复只传了 encounterId，缺少 firstEnum，导致后端校验失败
2. patientList.vue：仍传递原始值而非对象，且同样缺少 firstEnum

修复：两处调用均改为传递 { encounterId, firstEnum } 对象，firstEnum 默认值为1

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../doctorstation/components/callQueue/DoctorCallDialog.vue   | 2 +-
 .../src/views/doctorstation/components/patientList.vue        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/callQueue/DoctorCallDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/callQueue/DoctorCallDialog.vue
index de3b450c..e66d167a 100755
--- a/openhis-ui-vue3/src/views/doctorstation/components/callQueue/DoctorCallDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/callQueue/DoctorCallDialog.vue
@@ -375,7 +375,7 @@ const finishCallPatient = async () => {
     return;
   }
   try {
-    await completeEncounter({ encounterId: currentCallPatient.value.encounterId });
+    await completeEncounter({ encounterId: currentCallPatient.value.encounterId, firstEnum: currentCallPatient.value.firstEnum || 1 });
     emit('finish');
     emit('update:dialogVisible', false);
     ElMessage.success('患者已完诊');
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue b/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue
index 460ebec1..3bc2ed03 100755
--- a/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue
@@ -109,6 +109,7 @@ const props = defineProps({
 });
 const { proxy } = getCurrentInstance();
 const encounterId = ref();
+const firstEnum = ref(1); // 初复诊标识：1=初诊，2=复诊
 onMounted(() => {
   getPatientList();
 });
@@ -127,6 +128,7 @@ function getPatientList() {
 
 function clickRow(row) {
   encounterId.value = row.encounterId;
+  firstEnum.value = row.firstEnum ?? row.first_enum ?? 1;
   emits('cellClick', row);
 }
 
@@ -182,7 +184,7 @@ function handleComplete() {
   }
   proxy.$modal.confirm('是否完成该患者问诊？').then(() => {
     proxy.$modal.loading();
-    completeEncounter(encounterId.value).then(() => {
+    completeEncounter({ encounterId: encounterId.value, firstEnum: firstEnum.value }).then(() => {
       proxy.$modal.closeLoading();
       proxy.$modal.msgSuccess('完成问诊成功');
       getPatientList();