提交merge1.3

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

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 import request from '@/utils/request'
+=======
+import request from '@/utils/request';
+>>>>>>> v1.3
 
 /**
  * 获取住院患者列表
@@ -7,8 +11,13 @@ export function getPatientList(queryParams) {
   return request({
     url: '/nurse-station/advice-process/inpatient',
     method: 'get',
+<<<<<<< HEAD
     params: queryParams
   })
+=======
+    params: queryParams,
+  });
+>>>>>>> v1.3
 }
 
 /**
@@ -18,10 +27,25 @@ export function getWardList(queryParams) {
   return request({
     url: '/app-common/practitioner-ward',
     method: 'get',
+<<<<<<< HEAD
     params: queryParams
   })
 }
 
+=======
+    params: queryParams,
+  });
+}
+/**
+ * 获取科室下拉列表
+ */
+export function getOrgList() {
+  return request({
+    url: '/base-data-manage/organization/organization',
+    method: 'get',
+  });
+}
+>>>>>>> v1.3
 /**
  * 获取当前选中患者全部医嘱
  */
@@ -29,8 +53,13 @@ export function getPrescriptionList(queryParams) {
   return request({
     url: '/nurse-station/advice-process/inpatient-advice',
     method: 'get',
+<<<<<<< HEAD
     params: queryParams
   })
+=======
+    params: queryParams,
+  });
+>>>>>>> v1.3
 }
 
 /**
@@ -40,8 +69,13 @@ export function adviceExecute(data) {
   return request({
     url: '/nurse-station/advice-process/advice-execute',
     method: 'post',
+<<<<<<< HEAD
     data: data
   })
+=======
+    data: data,
+  });
+>>>>>>> v1.3
 }
 
 /**
@@ -51,6 +85,68 @@ export function adviceCancel(data) {
   return request({
     url: '/nurse-station/advice-process/advice-cancel',
     method: 'post',
+<<<<<<< HEAD
     data: data
   })
-}
+}
+=======
+    data: data,
+  });
+}
+/**
+ * 获取药品列表
+ */
+export function getAdviceBaseInfo(queryParams) {
+  return request({
+    url: '/doctor-station/advice/advice-base-info',
+    method: 'get',
+    params: queryParams,
+  });
+}
+/**
+ * 护士划价补费 -新增
+ */
+export function addBilling(data) {
+  return request({
+    url: '/inhospitalnursestation/nursebilling/add-billing',
+    method: 'post',
+    data: data,
+  });
+}
+/**
+ * 护士划价补费 -查询
+ */
+export function queryBilling(queryParams) {
+  return request({
+    url: '/inhospitalnursestation/nursebilling/innurse-billing-list/',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+/**
+ * 护士划价补费 -删除
+ */
+export function deleteBilling(data) {
+  return request({
+    url: '/inhospitalnursestation/nursebilling/del-billing',
+    method: 'post',
+    data: data,
+  });
+}
+// 目录分类子查询
+export function getDiseaseTreatmentInitLoc(id) {
+  return request({
+    url: '/base-data-manage/org-loc/loc-list?locationForm=' + id,
+    method: 'get',
+  });
+}
+// 住院护士站费用明细
+export function getCostDetail(queryParams) {
+  return request({
+    url: '/inhospitalnursestation/nursebilling/cost-detail/',
+    method: 'get',
+    params: queryParams,
+  });
+}
+>>>>>>> v1.3