解决合并冲突

openhis-ui-vue3/src/views/doctorstation/components/api.js

@@ -543,6 +543,16 @@ export function saveTcmDiagnosis(data) {
   })
 }
 
+/**
+ * 删除中医诊断
+ */
+export function deleteTcmDiagnosis(syndromeGroupNo) {
+  return request({
+    url: '/doctor-station/chinese-medical/tcm-diagnosis?syndromeGroupNo=' + syndromeGroupNo,
+    method: 'delete',
+  })
+}
+
 /**
  * 保存中医医嘱
  */
@@ -707,11 +717,11 @@ export function getOrderGroup(data) {
 }
 
 /**
- * 查询诊疗项目耗材绑定信息
+ * 查询项目绑定信息
  */
-export function getActivityBindDevice(data) {
+export function getBindDevice(data) {
   return request({
-    url: '/doctor-station/advice/activity-bind-device-info',
+    url: '/doctor-station/advice/order-bind-info',
     method: 'get',
     params: data
   })