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: '社区卫生院' } - ] }) }