diff --git a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue index b4be8325..6e17e4f1 100755 --- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue @@ -1373,13 +1373,13 @@ const getInspectionList = () => { // 如果返回的是分页对象 {records: [...], total: 100} if (Array.isArray(res.data.records)) { // 直接使用后端返回的数据(后端已按申请单返回,无需合并) - inspectionList.value = res.data.records + inspectionList.value = mergeInspectionApplyRecords(res.data.records) total.value = res.data.total || res.data.records.length } // 如果返回的是普通数组 else if (Array.isArray(res.data)) { - // 直接使用后端返回的数据 - inspectionList.value = res.data + // 合并同一个申请单的明细 + inspectionList.value = mergeInspectionApplyRecords(res.data) total.value = res.data.length } // 如果返回的是其他对象结构