提交merge1.3

openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js

@@ -1,12 +1,12 @@
-import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/openhis";
+import request from '@/utils/request';
+import { parseStrEmpty } from '@/utils/openhis';
 
 // 查询初期所需数据
 export function getInit() {
   return request({
     url: '/charge-manage/register/init',
-    method: 'get'
-  })
+    method: 'get',
+  });
 }
 
 // 查询患者信息
@@ -14,16 +14,16 @@ export function getOutpatientRegistrationList(query) {
   return request({
     url: '/charge-manage/register/patient-metadata',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 // 查询费用性质
 export function getContractList() {
   return request({
     url: '/app-common/contract-list',
-    method: 'get'
-  })
+    method: 'get',
+  });
 }
 
 // 查询诊断信息
@@ -31,8 +31,8 @@ export function getConditionDefinitionMetadata(query) {
   return request({
     url: '/charge-manage/register/condition-definition-metadata',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 // // 查询就诊位置
@@ -49,8 +49,8 @@ export function getLocationTree(query) {
   return request({
     url: '/charge-manage/register/org-list',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 // 根据位置id筛选医生
@@ -58,8 +58,8 @@ export function getPractitionerMetadata(query) {
   return request({
     url: '/charge-manage/register/practitioner-metadata',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 // 根据机构id筛选服务项目
@@ -67,8 +67,17 @@ export function getHealthcareMetadata(query) {
   return request({
     url: '/charge-manage/register/healthcare-metadata',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
+}
+
+// 更新患者手机号
+export function updatePatientPhone(data) {
+  return request({
+    url: '/patient-manage/information/update-patient-phone',
+    method: 'post',
+    data: data,
+  });
 }
 
 // 门诊挂号查询
@@ -76,8 +85,8 @@ export function getOutpatientRegistrationCurrent(query) {
   return request({
     url: '/charge-manage/register/current-day-encounter',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 // 新增门诊挂号信息
@@ -85,8 +94,8 @@ export function addOutpatientRegistration(data) {
   return request({
     url: '/payment/payment/reg-pre-pay',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // 新增病人信息
@@ -94,83 +103,79 @@ export function addPatient(data) {
   return request({
     url: '/patient-manage/information/patient-information',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
 }
 
-
 export function listmaritalstatus() {
   return request({
     url: '/patientmanage/information/list-maritalstatus',
     method: 'get',
-  })
+  });
 }
 
 export function listoccupationtype() {
   return request({
     url: '/patientmanage/information/list-occupationtype',
     method: 'get',
-  })
+  });
 }
 
 export function lisadministrativegender() {
   return request({
     url: '/patientmanage/information/list-administrativegender',
     method: 'get',
-  })
+  });
 }
 
 export function listbloodtypeabo() {
   return request({
     url: '/patientmanage/information/list-bloodtypeabo',
     method: 'get',
-  })
+  });
 }
 
-
 export function listbloodtypearh() {
   return request({
     url: '/patientmanage/information/list-bloodtypearh',
     method: 'get',
-  })
+  });
 }
 
 export function listfamilyrelationshiptype() {
-    return request({
-      url: '/patientmanage/information/list-familyrelationshiptype',
-      method: 'get',
-    })
-  }
+  return request({
+    url: '/patientmanage/information/list-familyrelationshiptype',
+    method: 'get',
+  });
+}
 
+// 查询患者相关
+export function patientlLists() {
+  return request({
+    url: '/patient-manage/information/init',
+    method: 'get',
+  });
+}
 
-  // 查询患者相关
-  export function patientlLists() {
-    return request({
-      url: '/patient-manage/information/init',
-      method: 'get'
-    })
-  }
+// 患者退号
+export function returnRegister(encounterId) {
+  return request({
+    url: '/charge-manage/register/return?encounterId=' + encounterId,
+    method: 'put',
+  });
+}
 
-  // 患者退号
-  export function returnRegister(encounterId) {
-    return request({
-      url: '/charge-manage/register/return?encounterId=' + encounterId,
-      method: 'put'
-    })
-  }
+/**
+ * 收费
+ */
+export function savePayment(data) {
+  return request({
+    url: '/payment/payment/reg-pay',
+    method: 'post',
+    data: data,
+  });
+}
 
-  /**
-   * 收费
-   */
-  export function savePayment(data) {
-    return request({
-      url: '/payment/payment/reg-pay',
-      method: 'post',
-      data: data
-    })
-  }
-
-  
 /**
  * 收费预结算
  */
@@ -178,8 +183,8 @@ export function precharge(data) {
   return request({
     url: '/payment/payment/precharge',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
 }
 
 /**
@@ -189,8 +194,20 @@ export function refund(data) {
   return request({
     url: '/payment/payment/uncharge',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
+}
+
+/**
+ * 退费预检（挂号预取消）
+ * GET /payment/payment/pre-cancel-reg?encounterId=xxx
+ */
+export function preCancelReg(encounterId) {
+  return request({
+    url: '/payment/payment/pre-cancel-reg',
+    method: 'get',
+    params: { encounterId },
+  });
 }
 
 /**
@@ -200,8 +217,8 @@ export function cancelRegister(data) {
   return request({
     url: '/charge-manage/register/return',
     method: 'put',
-    data: data
-  })
+    data: data,
+  });
 }
 
 /**
@@ -211,6 +228,7 @@ export function gerPreInfo(userMaessage) {
   return request({
     url: '/yb-request/per-info',
     method: 'post',
+<<<<<<< HEAD
     params: userMaessage
   })
 }
@@ -240,4 +258,31 @@ export function reprintRegistration(data) {
     method: 'post',
     data: data
   })
-}
+}
+=======
+    params: userMaessage,
+  });
+}
+
+/**
+ * 微信支付
+ */
+export function wxPay(data) {
+  return request({
+    url: '/three-part/pay/pay-for',
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 微信支付
+ */
+export function WxPayResult(data) {
+  return request({
+    url: '/three-part/pay/pay-query',
+    method: 'get',
+    data: data,
+  });
+}
+>>>>>>> v1.3