提交merge1.3

openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js

@@ -1,11 +1,19 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 export function listPatient(query) {
   return request({
     url: '/pharmacy-manage/western-medicine-dispense/encounter-list',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
+}
+
+export function devicePatientList(query) {
+  return request({
+    url: '/pharmacy-manage/device-dispense/encounter-list',
+    method: 'get',
+    params: query,
+  });
 }
 
 export function devicePatientList(query) {
@@ -20,47 +28,46 @@ export function listInit(query) {
   return request({
     url: '/pharmacy-manage/western-medicine-dispense/init',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 export function listWesternmedicine(query) {
   return request({
     url: '/pharmacy-manage/western-medicine-dispense/medicine-order',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 export function updateMedicion(prescriptionList) {
-    return request({
-      url: '/pharmacy-manage/western-medicine-dispense/medicine-dispense',
-      method: 'put',
-      data: prescriptionList
-    })
-  }
+  return request({
+    url: '/pharmacy-manage/western-medicine-dispense/medicine-dispense',
+    method: 'put',
+    data: prescriptionList,
+  });
+}
 export function prepareMedicion(data) {
-    return request({
-      url: '/pharmacy-manage/western-medicine-dispense/prepare',
-      method: 'put',
-      data: data
-    })
-  }
+  return request({
+    url: '/pharmacy-manage/western-medicine-dispense/prepare',
+    method: 'put',
+    data: data,
+  });
+}
 
-  
 export function backMedicion(data) {
   return request({
     url: '/pharmacy-manage/western-medicine-dispense/medicine-cancel',
     method: 'put',
-    data: data
-  })
+    data: data,
+  });
 }
 //扫码枪返回追溯码筛选
 export function itemTraceNo(params) {
   return request({
     url: '/app-common/item-trace-no?traceNoList=' + params,
     method: 'get',
-  })
+  });
 }
 
 /**
@@ -70,8 +77,8 @@ export function getReportRegisterInit(query) {
   return request({
     url: '/pharmacy-manage/device-dispense/device-order',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 /**
@@ -81,8 +88,8 @@ export function deviceDispense(params) {
   return request({
     url: '/pharmacy-manage/device-dispense/device-dispense',
     method: 'put',
-    data: params
-  })
+    data: params,
+  });
 }
 
 /**
@@ -92,6 +99,27 @@ export function deviceInvalid(data) {
   return request({
     url: '/pharmacy-manage/device-dispense/device-cancel',
     method: 'put',
-    data: data
-  })
+    data: data,
+  });
+}
+
+/**
+ * 跨批次发药匹配批号
+ */
+export function medicineMatch(data) {
+  return request({
+    url: '/pharmacy-manage/western-medicine-dispense/medicine-match',
+    method: 'get',
+    params: data,
+  });
+}
+/**
+ * 根据doctorId查询医生签名
+ */
+export function getDoctorSignature(query) {
+  return request({
+    url: '/app-common/practitioner-signature',
+    method: 'get',
+    params: query,
+  });
 }