提交merge1.3

openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/api.js

@@ -1,38 +1,12 @@
-<<<<<<< HEAD
-import request from '@/utils/request'
-=======
 import request from '@/utils/request';
->>>>>>> v1.3
 
 // 获取住院信息初期数据列表
 export function getInit(query) {
   return request({
     url: '/inpatient-manage/init',
     method: 'get',
-<<<<<<< HEAD
-    params: query
-  })
-}
-
-// 获取住院信息 分页显示
-// export function getAdmissionPage(query) {
-//   return request({
-//     url: '/inpatient-manage/admission-page',
-//     method: 'get',
-//     params: query
-//   })
-// }
-// 获取住院信息 分页显示 新
-export function getAdmissionPage(query) {
-  return request({
-    url: '/inhospital-charge/register/register-info',
-    method: 'get',
-    params: query
-  })
-=======
     params: query,
   });
->>>>>>> v1.3
 }
 
 // 住院无档登记
@@ -40,13 +14,8 @@ export function addAdmissionInfo(data) {
   return request({
     url: '/inpatient-manage/admission-information',
     method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-=======
     data: data,
   });
->>>>>>> v1.3
 }
 
 // 住院登记
@@ -54,13 +23,8 @@ export function admissionInfo(data) {
   return request({
     url: '/inpatient-manage/admission-information',
     method: 'put',
-<<<<<<< HEAD
-    data: data
-  })
-=======
     data: data,
   });
->>>>>>> v1.3
 }
 
 /**
@@ -70,11 +34,7 @@ export function getOrgList() {
   return request({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-<<<<<<< HEAD
-  })
-=======
   });
->>>>>>> v1.3
 }
 
 /**
@@ -83,13 +43,8 @@ export function getOrgList() {
 export function wardList() {
   return request({
     url: '/app-common/ward-list',
-<<<<<<< HEAD
-    method: 'get'
-  })
-=======
     method: 'get',
   });
->>>>>>> v1.3
 }
 
 /**
@@ -99,80 +54,39 @@ export function diagnosisInit() {
   return request({
     url: '/doctor-station/diagnosis/init',
     method: 'get',
-<<<<<<< HEAD
-  })
-=======
   });
->>>>>>> v1.3
 }
 
 // 查询患者相关
 export function patientlLists() {
   return request({
     url: '/patient-manage/information/init',
-<<<<<<< HEAD
-    method: 'get'
-  })
-=======
     method: 'get',
   });
->>>>>>> v1.3
 }
 
 // 查询患者相关
 export function doctorList(id) {
   return request({
     url: '/inpatient-manage/doctor-list?orgId=' + id,
-<<<<<<< HEAD
-    method: 'get'
-  })
-=======
     method: 'get',
   });
->>>>>>> v1.3
 }
 
 // 查询患者相关
 export function getPatientInfo(id, statusEnum) {
   return request({
     url: `/inpatient-manage/admission-one?id=${id}&statusEnum=${statusEnum}`,
-<<<<<<< HEAD
-    method: 'get'
-  })
-}
-
-
-// 获取患者基础信息
-export function getPatientBasicInfo(patientId) {
-  return request({
-    url: `/inhospital-charge/register/patient-info?patientId=${patientId}`,
-    method: 'get'
-  })
-}
-
-// 获取患者入院信息
-export function getInHospitalInfo(encounterId) {
-  return request({
-    url: `/inhospital-charge/register/in-hospital-info?encounterId=${encounterId}`,
-    method: 'get'
-  })
-=======
     method: 'get',
   });
->>>>>>> v1.3
 }
 
 // 获取病区床位信息
 export function getBedInfo(wardBusNo) {
   return request({
     url: `/inhospital-charge/register/beds-num?wardBusNo=${wardBusNo}`,
-<<<<<<< HEAD
-    method: 'get'
-  })
-=======
     method: 'get',
   });
->>>>>>> v1.3
 }
 
 // 住院登记
@@ -180,13 +94,8 @@ export function registerInHospital(data) {
   return request({
     url: '/inhospital-charge/register/by-cashier',
     method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-=======
     data: data,
   });
->>>>>>> v1.3
 }
 
 // 无档登记
@@ -194,26 +103,16 @@ export function noFilesRegister(data) {
   return request({
     url: '/inhospital-charge/register/no-files',
     method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-=======
     data: data,
   });
->>>>>>> v1.3
 }
 
 // 表单初始化
 export function patientFormInit() {
   return request({
     url: '/patient-manage/information/init',
-<<<<<<< HEAD
-    method: 'get'
-  })
-=======
     method: 'get',
   });
->>>>>>> v1.3
 }
 
 // 合同
@@ -221,11 +120,7 @@ export function getContractList() {
   return request({
     url: '/app-common/contract-list',
     method: 'get',
-<<<<<<< HEAD
-  })
-=======
   });
->>>>>>> v1.3
 }
 
 /**
@@ -235,11 +130,6 @@ export function getDiagnosisDefinitionList(queryParams) {
   return request({
     url: '/doctor-station/diagnosis/condition-definition-metadata',
     method: 'get',
-<<<<<<< HEAD
-    params: queryParams
-  })
-}
-=======
     params: queryParams,
   });
 }
@@ -345,4 +235,3 @@ export function gerPreInfo(data) {
 }
 
 
->>>>>>> v1.3