提交merge1.3

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js

@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-
-import request from '@/utils/request'
-=======
 import request from '@/utils/request';
->>>>>>> v1.3
 // 申请单相关接口
 
 /**
@@ -58,19 +53,6 @@ export function getNursingOrdersInfos() {
 }
 
 /**
-<<<<<<< HEAD
- * 查询护理医嘱信息
- */
-export function getNursingOrdersInfos() {
-  return request({
-    url: '/reg-doctorstation/special-advice/nursing-orders',
-    method: 'get'
-  })
-}
-
-/**
-=======
->>>>>>> v1.3
  * 保存护理医嘱信息
  * @param {Object} data - 护理医嘱数据
  * @param {number} data.encounterId - 就诊id
@@ -87,13 +69,8 @@ export function saveNursingOrders(data) {
   return request({
     url: '/reg-doctorstation/special-advice/nursing-orders',
     method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-=======
     data: data,
   });
->>>>>>> v1.3
 }
 
 /**
@@ -103,13 +80,8 @@ export function getEncounterNursingOrders(params) {
   return request({
     url: '/reg-doctorstation/special-advice/encounter-nursing-orders',
     method: 'get',
-<<<<<<< HEAD
-    params: params
-  })
-=======
     params: params,
   });
->>>>>>> v1.3
 }
 
 /**