From be93a77b646eabdecea23398123edbd4e6265798 Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Mon, 29 Jun 2026 11:11:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=8C=BB=E5=98=B1=E6=A0=B8=E5=AF=B9):=20?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E9=80=BB=E8=BE=91=E4=B8=8E=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 将前端默认截止时间从当天00:00:00改为23:59:59 2. 重构后端筛选条件，改为当日0点到指定截止时间的范围查询 3. 移除冗余的空安全终止时间判断逻辑 --- .../impl/AdviceProcessAppServiceImpl.java | 15 ++++++++------- .../components/prescriptionList.vue | 6 +++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java index c7da36a5e..d4feca4b7 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java @@ -188,7 +188,6 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { inpatientAdviceParam.setRequestStatus(null); // 提取deadline手动处理 // Bug #714修复：截止时间过滤，使用request_time限制检索范围 - // Bug #763修复：NULL-safe的end_time比较 String deadline = inpatientAdviceParam.getDeadline(); inpatientAdviceParam.setDeadline(null); // 构建查询条件 @@ -218,15 +217,17 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { = Arrays.stream(encounterIds.split(CommonConstants.Common.COMMA)).map(Long::parseLong).toList(); queryWrapper.in(CommonConstants.FieldName.EncounterId, encounterIdList); } - // 手动拼接截止时间条件： - // 1. request_time >= deadline：只显示截止时间之后创建的医嘱（Bug #714修复） - // 默认值为当天00:00:00，默认只加载当天数据，避免加载过长周期的历史未核对数据 - // 2. end_time IS NULL OR end_time <= deadline：NULL-safe终止时间比较（Bug #763修复） + // 手动拼接截止时间条件：当天00:00:00 <= request_time <= deadline + // 默认deadline为当天23:59:59，既排除历史医嘱，又保证护士可以校对当天医嘱。 if (deadline != null && !deadline.isEmpty()) { Date deadlineTime = DateUtils.parseDate(deadline); if (deadlineTime != null) { - queryWrapper.ge("request_time", deadlineTime); - queryWrapper.and(w -> w.isNull("end_time").or().le("end_time", deadlineTime)); + Date dayStartTime = Date.from(deadlineTime.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDate() + .atStartOfDay(ZoneId.systemDefault()) + .toInstant()); + queryWrapper.between("request_time", dayStartTime, deadlineTime); } else { log.warn("截止时间解析失败: {}", deadline); } diff --git a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue index aa4a49c01..6ba5fef6a 100755 --- a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue +++ b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue @@ -26,6 +26,10 @@ 临时 + 截止时间：