From 18ada7c39212e1c7f6ad870095024eb4de09eda8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Fri, 8 May 2026 21:51:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Fix=20Bug=20#445:=20=E3=80=90=E6=89=8B?= =?UTF-8?q?=E6=9C=AF=E7=AE=A1=E7=90=86-=E9=97=A8=E8=AF=8A=E6=89=8B?= =?UTF-8?q?=E6=9C=AF=E5=AE=89=E6=8E=92=E3=80=91=E4=B8=B4=E6=97=B6=E5=8C=BB?= =?UTF-8?q?=E5=98=B1=E7=94=9F=E6=88=90=E7=95=8C=E9=9D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9A=E5=B7=B2=E7=94=9F=E6=88=90=E5=8C=BB?= =?UTF-8?q?=E5=98=B1=E7=9A=84=E8=AE=A1=E8=B4=B9=E9=A1=B9=E7=9B=AE=E6=9C=AA?= =?UTF-8?q?=E4=BB=8E=E2=80=9C=E5=BE=85=E7=94=9F=E6=88=90=E2=80=9D=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=89=94=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openhis-ui-vue3/src/api/surgicalschedule.js | 18 ++++++++++++++++++ .../home/components/adviceBaseList.vue | 9 +++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/openhis-ui-vue3/src/api/surgicalschedule.js b/openhis-ui-vue3/src/api/surgicalschedule.js index 93eb859a..64bedfac 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(); From 7ea8696b0a0e3e13fa0767a75f1d4cedd2d75ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Fri, 8 May 2026 21:53:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Fix=20Bug=20#472:=20=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E6=89=8B?= =?UTF-8?q?=E6=9C=AF=E7=94=B3=E8=AF=B7=E5=8D=95=EF=BC=9A=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E6=89=8B=E6=9C=AF=E9=A1=B9=E7=9B=AE=E6=97=A0=E6=95=88=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=BC=80?= =?UTF-8?q?=E7=AB=8B=E5=8C=BB=E5=98=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openhis-ui-vue3/src/api/surgicalschedule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openhis-ui-vue3/src/api/surgicalschedule.js b/openhis-ui-vue3/src/api/surgicalschedule.js index 64bedfac..6c54b5a4 100755 --- a/openhis-ui-vue3/src/api/surgicalschedule.js +++ b/openhis-ui-vue3/src/api/surgicalschedule.js @@ -57,7 +57,7 @@ export function getGeneratedOrders(chargeIds) { return request({ url: '/clinical-manage/surgery-schedule/generated-orders', method: 'post', - data: chargeIds + data: { chargeIds } }) } From 637169f1d268b2b955adc42a6c12034edb6dfa5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Fri, 8 May 2026 21:56:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Fix=20Bug=20#466:=20[=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=94=B3=E8=AF=B7]=20=E7=94=B3=E8=AF=B7=E5=8D=95?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=BC=BA=E5=A4=B1=E6=A0=B8=E5=BF=83=E8=B4=A8?= =?UTF-8?q?=E6=8E=A7=E5=AD=97=E6=AE=B5=EF=BC=88=E7=94=B3=E8=AF=B7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E6=9C=AC=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4=EF=BC=89=E5=8F=8A=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/components/applicationShow/api.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) 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, }); From 4f5738965624a91cdb503ca738fe88a20f6048b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Fri, 8 May 2026 22:00:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Fix=20Bug=20#443:=20=E6=89=8B=E6=9C=AF?= =?UTF-8?q?=E8=AE=A1=E8=B4=B9=EF=BC=9A=E7=82=B9=E5=87=BB=E2=80=9C=E7=AD=BE?= =?UTF-8?q?=E5=8F=91=E2=80=9D=E8=80=97=E6=9D=90=E6=97=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/inpatientDoctor/home/components/order/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ 新增 保存 - 签发 + 签发 撤回