解决合并冲突

openhis-ui-vue3/src/views/charge/cliniccharge/components/api.js

@@ -5,41 +5,62 @@ import request from '@/utils/request'
  */
 export function getList(queryParams) {
     return request({
-      url: '/charge-manage/charge/encounter-patient-page',
-      method: 'get',
-      params: queryParams
+        url: '/charge-manage/charge/encounter-patient-page',
+        method: 'get',
+        params: queryParams
     })
 }
-  
+
 /**
  * 患者处方列表
  */
 export function getChargeList(encounterId) {
     return request({
-      url: '/charge-manage/charge/patient-prescription?encounterId=' + encounterId,
-      method: 'get',
+        url: '/charge-manage/charge/patient-prescription?encounterId=' + encounterId,
+        method: 'get',
     })
 }
-  
-  
+
+
 /**
  * 医保转自费
  */
 export function changeToSelfPay(encounterId) {
     return request({
-      url: '/charge-manage/charge/self-pay?encounterId=' + encounterId,
-      method: 'put',
+        url: '/charge-manage/charge/self-pay?encounterId=' + encounterId,
+        method: 'put',
     })
 }
-  
-  
+
+
 /**
  * 自费转医保
  */
 export function changeToMedicalInsurance(encounterId) {
     return request({
-      url: '/charge-manage/charge/medical-insurance?encounterId=' + encounterId,
-      method: 'put',
+        url: '/charge-manage/charge/medical-insurance?encounterId=' + encounterId,
+        method: 'put',
+    })
+}
+
+/**
+ * 学生医保转学生自费
+ */
+export function changeStudentPayTosStudentSelf(encounterId) {
+    return request({
+        url: '/charge-manage/charge/student-self-pay?encounterId=' + encounterId,
+        method: 'put',
+    })
+}
+
+
+/**
+ * 学生自费转学生医保
+ */
+export function changeStudentSelfToStudentPay(encounterId) {
+    return request({
+        url: '/charge-manage/charge/student-yb-pay?encounterId=' + encounterId,
+        method: 'put',
     })
 }
 
@@ -48,9 +69,9 @@ export function changeToMedicalInsurance(encounterId) {
  */
 export function savePayment(data) {
     return request({
-      url: '/payment/payment/charge',
-      method: 'post',
-      data: data
+        url: '/payment/payment/charge',
+        method: 'post',
+        data: data
     })
 }
 
@@ -59,8 +80,8 @@ export function savePayment(data) {
  */
 export function init() {
     return request({
-      url: '/charge-manage/charge/init',
-      method: 'get',
+        url: '/charge-manage/charge/init',
+        method: 'get',
     })
 }
 
@@ -69,9 +90,9 @@ export function init() {
  */
 export function precharge(data) {
     return request({
-      url: '/payment/payment/precharge',
-      method: 'post',
-      data: data
+        url: '/payment/payment/precharge',
+        method: 'post',
+        data: data
     })
 }
 
@@ -80,21 +101,32 @@ export function precharge(data) {
  */
 export function unprecharge(data) {
     return request({
-      url: '/payment/payment/unprecharge',
-      method: 'post',
-      params: data
+        url: '/payment/payment/unprecharge',
+        method: 'post',
+        params: data
     })
 }
-  
+
 
 /**
  * 发耗材
  */
 export function dispenseMedicalConsumables(data) {
     return request({
-      url: '/pharmacy-manage/device-dispense/consumables-dispense',
-      method: 'put',
-      data: data
+        url: '/pharmacy-manage/device-dispense/consumables-dispense',
+        method: 'put',
+        data: data
     })
 }
-  
+
+
+/**
+ * 补打小票
+ */
+export function getChargeInfo(param) {
+    return request({
+        url: '/payment/bill/getDetail',
+        method: 'get',
+        params: param
+    })
+}