提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/api.js
+++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js
@@ -273,12 +273,7 @@ export function singOut(data) {
    url: '/doctor-station/advice/sign-off',
    method: 'post',
    data: data,
-<<<<<<< HEAD
-    skipErrorMsg: true
-  })
-=======
  });
->>>>>>> v1.3
 }
 /**
 * 获取患者本次就诊处方