diff --git a/openhis-ui-vue3/src/api/surgicalschedule.js b/openhis-ui-vue3/src/api/surgicalschedule.js index 93eb859a..6c54b5a4 100755 --- a/openhis-ui-vue3/src/api/surgicalschedule.js +++ b/openhis-ui-vue3/src/api/surgicalschedule.js @@ -52,6 +52,24 @@ export function getSurgeryApplyList(query) { }) } +// 查询已生成医嘱的计费项目 +export function getGeneratedOrders(chargeIds) { + return request({ + url: '/clinical-manage/surgery-schedule/generated-orders', + method: 'post', + data: { chargeIds } + }) +} + +// 生成临时医嘱 +export function generateTemporaryOrders(data) { + return request({ + url: '/clinical-manage/surgery-schedule/generate-orders', + method: 'post', + data: data + }) +} + // 导出手术安排列表 export function exportSurgerySchedule(query) { return request({ diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue index a1ec01ab..3802ebda 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue @@ -86,8 +86,13 @@ const tableColumns = computed(() => [ * @param searchKey 搜索关键词 */ function refresh(adviceType: any, categoryCode: string, searchKey: string) { - queryParams.value.adviceTypes = - adviceType !== undefined && adviceType !== '' ? String(adviceType) : '1,2,3,6'; + // 有搜索词时跨类型搜索,避免用户输入"级护理"但因当前adviceType为药品而搜不到诊疗类护理项目 + if (searchKey) { + queryParams.value.adviceTypes = '1,2,3,6'; + } else { + queryParams.value.adviceTypes = + adviceType !== undefined && adviceType !== '' ? String(adviceType) : '1,2,3,6'; + } queryParams.value.categoryCode = categoryCode || ''; queryParams.value.searchKey = searchKey || ''; getList(); diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js index 16a0ef86..2b9d1c0b 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js @@ -2,22 +2,7 @@ import request from '@/utils/request'; // 申请单相关接口 -/** - * 查询检查申请单 - */ -export function getCheck(queryParams) { - return request({ - url: '/reg-doctorstation/request-form/get-check', - method: 'get', - params: queryParams, - }); -} -/** - * 查询检验申请单 - */ -export function getInspection(queryParams) { - return request({ - url: '/reg-doctorstation/request-form/get-inspection', + method: 'get', params: queryParams, }); diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue index e7a3ef79..b78302f2 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue @@ -6,7 +6,7 @@ 新增 保存 - 签发 + 签发 撤回