diff --git a/src/api/inspect/inspectpatient/index.ts b/src/api/inspect/inspectpatient/index.ts index 2411fdd..6e07922 100644 --- a/src/api/inspect/inspectpatient/index.ts +++ b/src/api/inspect/inspectpatient/index.ts @@ -137,5 +137,9 @@ export const PatientApi = { return await request.put({ url: `/inspect/patient/updatePrintStatus?medicalSn=${medicalSn}&printtime=${printtime.toISOString()}` }) + }, + //生成体检报告 + generateReport: async (medicalSn: string) => { + return await request.get({ url: `/inspect/patient/generateReport?medicalSn=` + medicalSn }) } } diff --git a/src/views/Department-entry/Medical-examination-vehicle.vue b/src/views/Department-entry/Medical-examination-vehicle.vue index 6d6174a..6551037 100644 --- a/src/views/Department-entry/Medical-examination-vehicle.vue +++ b/src/views/Department-entry/Medical-examination-vehicle.vue @@ -1959,7 +1959,7 @@ const handleSaveAllResults = async () => { if (!result) return ElMessage.success('所有检查结果保存成功') - + await PatientApi.generateReport(selectedPatient.value?.medicalSn) // 重新加载数据以更新界面 await refreshExamData() } catch (error) { diff --git a/src/views/Department-entry/summary.vue b/src/views/Department-entry/summary.vue index 5ace970..d60691c 100644 --- a/src/views/Department-entry/summary.vue +++ b/src/views/Department-entry/summary.vue @@ -385,8 +385,8 @@ const queryPatientData = async () => { } console.log(response.data.chiefinspector) // 添加对医生ID的处理 - if (response.data.chiefinspector) { - selectedDoctor.value = response.data.chiefinspector + if (response.data.chiefinspectorid && response.data.chiefinspector) { + selectedDoctor.value = response.data.chiefinspectorid + '|' + response.data.chiefinspector } } } catch (error) { @@ -447,8 +447,8 @@ watch(() => props.patient, (newVal) => { if (newVal.medicalSn) { loadPatientItems() } - if (newVal.chiefinspector) { - selectedDoctor.value = newVal.chiefinspector + if (newVal.chiefinspectorid && newVal.chiefinspector) { + selectedDoctor.value = newVal.chiefinspectorid + '|' + newVal.chiefinspector } } }, { deep: true, immediate: true })