提交merge1.3

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

@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 
 import request from '@/utils/request'
+=======
+import request from '@/utils/request';
+>>>>>>> v1.3
 // 申请单相关接口
 
 /**
@@ -9,8 +13,8 @@ export function getCheck(queryParams) {
   return request({
     url: '/reg-doctorstation/request-form/get-check',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 /**
  * 查询检验申请单
@@ -19,8 +23,8 @@ export function getInspection(queryParams) {
   return request({
     url: '/reg-doctorstation/request-form/get-inspection',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 /**
  * 查询输血申请单
@@ -29,8 +33,8 @@ export function getBloodTransfusion(queryParams) {
   return request({
     url: '/reg-doctorstation/request-form/get-blood-transfusion',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 /**
  * 查询手术申请单
@@ -39,12 +43,22 @@ export function getSurgery(queryParams) {
   return request({
     url: '/reg-doctorstation/request-form/get-surgery',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 
+/**
+ * 查询护理医嘱信息
+ */
+export function getNursingOrdersInfos() {
+  return request({
+    url: '/reg-doctorstation/special-advice/nursing-orders',
+    method: 'get',
+  });
+}
 
 /**
+<<<<<<< HEAD
  * 查询护理医嘱信息
  */
 export function getNursingOrdersInfos() {
@@ -55,6 +69,8 @@ export function getNursingOrdersInfos() {
 }
 
 /**
+=======
+>>>>>>> v1.3
  * 保存护理医嘱信息
  * @param {Object} data - 护理医嘱数据
  * @param {number} data.encounterId - 就诊id
@@ -71,8 +87,13 @@ export function saveNursingOrders(data) {
   return request({
     url: '/reg-doctorstation/special-advice/nursing-orders',
     method: 'post',
+<<<<<<< HEAD
     data: data
   })
+=======
+    data: data,
+  });
+>>>>>>> v1.3
 }
 
 /**
@@ -82,8 +103,33 @@ export function getEncounterNursingOrders(params) {
   return request({
     url: '/reg-doctorstation/special-advice/encounter-nursing-orders',
     method: 'get',
+<<<<<<< HEAD
     params: params
   })
+=======
+    params: params,
+  });
+>>>>>>> v1.3
 }
 
+/**
+ * 查询检验报告 url
+ */
+export function getProofResult(queryParams) {
+  return request({
+    url: '/doctor-station/advice/proof-result',
+    method: 'get',
+    params: queryParams,
+  });
+}
 
+/**
+ * 查询检查报告 url
+ */
+export function getTestResult(queryParams) {
+  return request({
+    url: '/doctor-station/advice/test-result',
+    method: 'get',
+    params: queryParams,
+  });
+}