diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
index 6090fd4b6..e4091d0f0 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -583,6 +583,9 @@
LEFT JOIN adm_location AS AL ON AL.id = DR.perform_location AND AL.delete_flag = '0'
WHERE CI.delete_flag = '0'
AND CI.service_table = 'wor_device_request'
+
+ AND (DR.generate_source_enum IS NULL OR DR.generate_source_enum = #{generateSourceEnum})
+
AND CI.encounter_id = #{encounterId}
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
index 709e4303c..750671849 100755
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
@@ -1059,7 +1059,12 @@ function handleSave() {
groupIndexList.value = []
groupList.value = []
nextId.value = 1;
+ } else {
+ proxy.$modal.msgError(res?.msg || '签发失败,请重试');
}
+ }).catch((error) => {
+ console.error('签发失败:', error);
+ proxy.$modal.msgError(error?.response?.data?.msg || error?.message || '签发失败,请重试');
});
}