From 353f2674880d775a4d04b195e8b2b4d4958951ea Mon Sep 17 00:00:00 2001 From: HuangXinQuan Date: Fri, 27 Mar 2026 11:41:53 +0800 Subject: [PATCH] =?UTF-8?q?261=20=E9=A2=84=E7=BA=A6=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E3=80=8B=E7=A7=91=E5=AE=A4=E9=A2=84=E7=BA=A6=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=B4=E6=8A=A4=EF=BC=9A=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E6=9C=AA?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E7=8A=B6=E6=80=81=E4=B8=BA=E6=9C=AA?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=9A=84=E6=9C=BA=E6=9E=84=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=88=E5=8C=85=E6=8B=AC=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?/=E3=80=90=E7=BC=96=E8=BE=91=E3=80=91=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DoctorScheduleAppServiceImpl.java | 1 - .../src/api/appoinmentmanage/deptappthoursManage.js | 3 ++- openhis-ui-vue3/src/utils/medicalConstants.js | 8 ++++++++ .../appoinmentmanage/deptappthoursManage/index.vue | 13 ------------- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java index 51b6fdb4..43b6cbbd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java @@ -280,7 +280,6 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService { .set(doctorSchedule.getRegisterFee() != null, SchedulePool::getFee, Double.valueOf(doctorSchedule.getRegisterFee().toString())) .set(doctorSchedule.getRegisterFee() != null, SchedulePool::getInsurancePrice, Double.valueOf(doctorSchedule.getRegisterFee().toString())) - .set(doctorSchedule.getRegisterItem() != null, SchedulePool::getRegType, doctorSchedule.getRegisterItem()) .update(); } diff --git a/openhis-ui-vue3/src/api/appoinmentmanage/deptappthoursManage.js b/openhis-ui-vue3/src/api/appoinmentmanage/deptappthoursManage.js index 577110e4..b7fc6ada 100644 --- a/openhis-ui-vue3/src/api/appoinmentmanage/deptappthoursManage.js +++ b/openhis-ui-vue3/src/api/appoinmentmanage/deptappthoursManage.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { STATUS } from '@/utils/medicalConstants' export function getDeptAppthoursList(query) { return request({ @@ -71,7 +72,7 @@ export function getTenantList() { params: { pageNum: 1, pageSize: 1000, - status: '1' // 只获取已启动的机构 (1=已启动，0=未启动) + status: STATUS.NORMAL // 只获取正常/启用的机构 } }) } diff --git a/openhis-ui-vue3/src/utils/medicalConstants.js b/openhis-ui-vue3/src/utils/medicalConstants.js index 9dad29fe..ac6de2c1 100644 --- a/openhis-ui-vue3/src/utils/medicalConstants.js +++ b/openhis-ui-vue3/src/utils/medicalConstants.js @@ -154,3 +154,11 @@ export default { getDiagTypeList, getDiagTypeDescription, }; + +/** + * 状态通用常量（与后端 status 字段保持一致：0=正常/启用，1=停用） + */ +export const STATUS = { + NORMAL: '0', // 正常/启用 + DISABLE: '1' // 停用 +}; diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/deptappthoursManage/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/deptappthoursManage/index.vue index d70e9763..0cbf46dc 100644 --- a/openhis-ui-vue3/src/views/appoinmentmanage/deptappthoursManage/index.vue +++ b/openhis-ui-vue3/src/views/appoinmentmanage/deptappthoursManage/index.vue @@ -577,25 +577,12 @@ function getTenantOptions() { } else { tenantOptions.value = [] } - tenantOptions.value = [ - { id: 1, tenantName: '演示医院' }, - { id: 2, tenantName: '社区卫生院' }, - ...tenantOptions.value - ] } else { console.warn('获取租户列表失败:', response.msg) - tenantOptions.value = [ - { id: 1, tenantName: '演示医院' }, - { id: 2, tenantName: '社区卫生院' } - ] } }) .catch(error => { console.error('获取租户列表失败:', error) - tenantOptions.value = [ - { id: 1, tenantName: '演示医院' }, - { id: 2, tenantName: '社区卫生院' } - ] }) }