diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java index 7867bcaa..6f72a6f6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java @@ -191,7 +191,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer boolean isEmpty = ObjectUtil.isAllEmpty(emrDetailResult, diagnosisResult, adviceResult, symptom,illness, tcmPrescriptionResult); if (!isEmpty) { - return R.fail("已产生业务数据,无法取消,请删除相关业务数据!"); + return R.fail(); } //2.取消接诊,患者重新回到患者队列待诊中 diff --git a/openhis-ui-vue3/src/utils/request.js b/openhis-ui-vue3/src/utils/request.js index 81a649b1..1a5a2c37 100644 --- a/openhis-ui-vue3/src/utils/request.js +++ b/openhis-ui-vue3/src/utils/request.js @@ -74,7 +74,7 @@ service.interceptors.request.use(config => { }) // 响应拦截器 -service.interceptors.response.use(res => { + service.interceptors.response.use(res => { // 未设置状态码则默认成功状态 const code = res.data.code || 200; // 获取错误信息 @@ -97,13 +97,22 @@ service.interceptors.response.use(res => { } return Promise.reject('无效的会话,或者会话已过期,请重新登录。') } else if (code === 500) { - ElMessage({ message: msg, type: 'error' }) + // 检查是否需要跳过错误提示 + if (!res.config?.skipErrorMsg) { + ElMessage({ message: msg, type: 'error' }) + } return Promise.reject(new Error(msg)) } else if (code === 601) { - ElMessage({ message: msg, type: 'warning' }) + // 检查是否需要跳过错误提示 + if (!res.config?.skipErrorMsg) { + ElMessage({ message: msg, type: 'warning' }) + } return Promise.reject(new Error(msg)) } else if (code !== 200) { - ElNotification.error({ title: msg }) + // 检查是否需要跳过错误提示 + if (!res.config?.skipErrorMsg) { + ElNotification.error({ title: msg }) + } return Promise.reject('error') } else { return Promise.resolve(res.data) @@ -119,10 +128,12 @@ service.interceptors.response.use(res => { } else if (message.includes("Request failed with status code")) { message = "系统接口" + message.substr(message.length - 3) + "异常"; } - ElMessage({ message: message, type: 'error', duration: 5 * 1000 }) + // 检查是否需要跳过错误提示 + if (!error.config?.skipErrorMsg) { + ElMessage({ message: message, type: 'error', duration: 5 * 1000 }) + } return Promise.reject(error) - } -) + }) // 通用下载方法 export function download(url, params, filename, config) { diff --git a/openhis-ui-vue3/src/views/doctorstation/components/api.js b/openhis-ui-vue3/src/views/doctorstation/components/api.js index 65a3bf1c..0521a2d4 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/api.js +++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js @@ -66,10 +66,11 @@ export function completeEncounter(encounterId) { /** * 取消接诊 */ -export function cancelEncounter(encounterId) { +export function cancelEncounter(encounterId, config = {}) { return request({ url: '/doctor-station/main/cancel-encounter?encounterId=' + encounterId, method: 'get', + ...config }) } diff --git a/openhis-ui-vue3/src/views/doctorstation/index.vue b/openhis-ui-vue3/src/views/doctorstation/index.vue index 1ebb2f84..d5223191 100644 --- a/openhis-ui-vue3/src/views/doctorstation/index.vue +++ b/openhis-ui-vue3/src/views/doctorstation/index.vue @@ -497,7 +497,7 @@ function handleCancelEncounter(){ type: 'warning' }).then(() => { //调用取消接诊API - cancelEncounter(patientInfo.value.encounterId).then((res) => { + cancelEncounter(patientInfo.value.encounterId, { skipErrorMsg: true }).then((res) => { if (res.code == 200) { proxy.$modal.msgSuccess('取消接诊成功'); patientInfo.value = {};