提交merge1.3

openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-import request from '@/utils/request'
-=======
 import request from '@/utils/request';
->>>>>>> v1.3
 
 /**
  * 获取住院患者列表
@@ -11,13 +7,8 @@ export function getPatientList(queryParams) {
   return request({
     url: '/nurse-station/advice-process/inpatient',
     method: 'get',
-<<<<<<< HEAD
-    params: queryParams
-  })
-=======
     params: queryParams,
   });
->>>>>>> v1.3
 }
 
 /**
@@ -27,12 +18,6 @@ export function getWardList(queryParams) {
   return request({
     url: '/app-common/practitioner-ward',
     method: 'get',
-<<<<<<< HEAD
-    params: queryParams
-  })
-}
-
-=======
     params: queryParams,
   });
 }
@@ -45,7 +30,6 @@ export function getOrgList() {
     method: 'get',
   });
 }
->>>>>>> v1.3
 /**
  * 获取当前选中患者全部医嘱
  */
@@ -53,13 +37,8 @@ export function getPrescriptionList(queryParams) {
   return request({
     url: '/nurse-station/advice-process/inpatient-advice',
     method: 'get',
-<<<<<<< HEAD
-    params: queryParams
-  })
-=======
     params: queryParams,
   });
->>>>>>> v1.3
 }
 
 /**
@@ -69,13 +48,8 @@ export function adviceExecute(data) {
   return request({
     url: '/nurse-station/advice-process/advice-execute',
     method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-=======
     data: data,
   });
->>>>>>> v1.3
 }
 
 /**
@@ -85,11 +59,6 @@ export function adviceCancel(data) {
   return request({
     url: '/nurse-station/advice-process/advice-cancel',
     method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-}
-=======
     data: data,
   });
 }
@@ -149,4 +118,3 @@ export function getCostDetail(queryParams) {
     params: queryParams,
   });
 }
->>>>>>> v1.3