新增门诊医生站确认取消接诊后移除错误消息提示

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.取消接诊，患者重新回到患者队列待诊中

openhis-ui-vue3/src/utils/request.js

@@ -97,13 +97,22 @@ service.interceptors.response.use(res => {
     }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
+      // 检查是否需要跳过错误提示
+      if (!res.config?.skipErrorMsg) {
         ElMessage({ message: msg, type: 'error' })
+      }
       return Promise.reject(new Error(msg))
     } else if (code === 601) {
+      // 检查是否需要跳过错误提示
+      if (!res.config?.skipErrorMsg) {
         ElMessage({ message: msg, type: 'warning' })
+      }
       return Promise.reject(new Error(msg))
     } else if (code !== 200) {
+      // 检查是否需要跳过错误提示
+      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) + "异常";
     }
+    // 检查是否需要跳过错误提示
+    if (!error.config?.skipErrorMsg) {
       ElMessage({ message: message, type: 'error', duration: 5 * 1000 })
-    return Promise.reject(error)
     }
-)
+    return Promise.reject(error)
+  })
 
 // 通用下载方法
 export function download(url, params, filename, config) {

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
   })
 }
 

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 = {};