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();