From 4bf74a1ff0f749de8cf3b88a93a1b3dd7f17cd61 Mon Sep 17 00:00:00 2001 From: HuangShun <148689675+huabuweixin@users.noreply.github.com> Date: Thu, 5 Feb 2026 10:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug131=20=E3=80=90=E5=85=A5?= =?UTF-8?q?=E5=87=BA=E8=BD=AC=E7=AE=A1=E7=90=86=E3=80=91-=E3=80=8B?= =?UTF-8?q?=E5=85=A5=E9=99=A2=E7=97=85=E5=8C=BA=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=90=8E=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E8=81=94=E5=8A=A8=E6=A1=86=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B9=9F=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/inpatientNurse/inOut/components/api.js | 11 +++++++++++ .../inOut/components/bedAllocation.vue | 15 ++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/api.js index 1cd68768..62053fd7 100644 --- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/api.js +++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/api.js @@ -145,3 +145,14 @@ export function terminalCleaning(encounterId) { }, }); } + +/** + * 获取病区列表(与病区管理页面相同的接口) + */ +export function getWardList(queryParams) { + return request({ + url: '/base-data-manage/location/location-page', + method: 'get', + params: queryParams, + }); +} diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue index 1d7650f8..7241432b 100644 --- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue @@ -89,7 +89,7 @@ import Filter from '@/components/TableLayout/Filter.vue'; import {computed, onBeforeMount, onMounted, reactive, ref} from 'vue'; import TransferInDialog from './transferInDialog.vue'; import SignEntryDialog from './signEntryDialog.vue'; -import {childLocationList, getBedInfo, getInit, getPendingInfo, getPractitionerWard} from './api'; +import {childLocationList, getBedInfo, getInit, getPendingInfo, getWardList} from './api'; import {ElLoading, ElMessage, ElMessageBox} from 'element-plus'; import PendingPatientList from '@/components/PendingPatientList/index.vue'; @@ -232,15 +232,16 @@ const ininData = async () => { initInfoOptions.value = initRes.data; priorityOptions.value = initRes.data.priorityOptions || []; - // 然后获取科室数据 - const wardRes = await getPractitionerWard(); + // 然后获取病区数据(使用与病区管理页面相同的接口) + const wardRes = await getWardList({ pageNum: 1, pageSize: 50, formEnum: 4 }); + const wardList = wardRes.data?.records || []; selectHosLoding.value = false; - queryParams.value.wardId = wardRes[0]?.id || ''; - initInfoOptions.value.wardListOptions = wardRes; + queryParams.value.wardId = wardList[0]?.id || ''; + initInfoOptions.value.wardListOptions = wardList; // 获取病房数据 - if (wardRes[0]?.id) { - await changeWardLocationId(wardRes[0].id, true); // 传入 true 表示初始化阶段,不调用 getList + if (wardList[0]?.id) { + await changeWardLocationId(wardList[0].id, true); // 传入 true 表示初始化阶段,不调用 getList } // 最后获取列表数据