From 7202151a41dad5c1d6a8d3622909662a934beccc Mon Sep 17 00:00:00 2001 From: wzk <2438381872@qq.com> Date: Mon, 17 Nov 2025 11:04:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=8C=82=E5=8F=B7=E6=B6=88?= =?UTF-8?q?=E9=99=A4=E9=80=80=E6=AC=BE=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OutpatientRegistrationAppServiceImpl.java | 8 +++++++- .../src/views/charge/outpatientregistration/index.vue | 7 +++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java index 5fbd84ed..4579fd36 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java @@ -272,7 +272,13 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra if (statusEnumParam != null && !statusEnumParam.isEmpty()) { try { Integer statusEnum = Integer.parseInt(statusEnumParam); - queryWrapper.eq("status_enum", statusEnum); + if (statusEnum == -1) { + // -1 表示排除退号记录（正常挂号） + queryWrapper.ne("status_enum", 6); + } else { + // 其他值表示精确匹配 + queryWrapper.eq("status_enum", statusEnum); + } } catch (NumberFormatException e) { // 忽略无效的参数值 } diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue index 2e018b02..ef940879 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue @@ -1156,8 +1156,7 @@ function handleQueryTypeChange() { queryParams.value.statusEnum = 6; } else if (queryType.value === 'normal') { // 查询正常挂号（排除退号状态） - queryParams.value.statusEnum = undefined; // 或者设置为非6的状态 - // 如果需要排除退号，可以在后端处理，这里先不设置 + queryParams.value.statusEnum = -1; // 使用特殊值表示排除退号记录 } else { // 查询全部 queryParams.value.statusEnum = undefined; @@ -1174,8 +1173,8 @@ function handleQuery() { if (queryType.value === 'returned') { queryParams.value.statusEnum = 6; // 退号状态 } else if (queryType.value === 'normal') { - // 正常挂号，不设置statusEnum或排除6 - queryParams.value.statusEnum = undefined; + // 正常挂号，排除退号记录 + queryParams.value.statusEnum = -1; // 使用特殊值表示排除退号记录 } else { // 全部 queryParams.value.statusEnum = undefined;