From e4770d0ed7cfa088cd9c8672b7eb7eb6eb21ac2d Mon Sep 17 00:00:00 2001 From: Euni4U <958079825@qq.com> Date: Sat, 19 Apr 2025 18:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectPatientServiceImpl.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java index 861514c..0345c3f 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java @@ -753,13 +753,27 @@ public class InspectPatientServiceImpl implements InspectPatientService { @Override public List getPatientSupplementsByDates(List dates) { - if (dates == null || dates.isEmpty()) { + if (dates == null || dates.isEmpty() || dates.size() < 2) { return Collections.emptyList(); } + // 获取起始日期和结束日期 + LocalDate startDate = dates.get(0); + LocalDate endDate = dates.get(1); + // 构建查询条件 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(InspectPatientDO::getPrinttime, dates); + + // 添加打印状态条件 + queryWrapper.eq(InspectPatientDO::getIsprint, 1); + + // 添加日期范围条件 - 从开始日期的0点到结束日期的23:59:59 + queryWrapper.between(InspectPatientDO::getPrinttime, + startDate.atStartOfDay(), + endDate.atTime(23, 59, 59)); + + // 按打印时间倒序 + queryWrapper.orderByDesc(InspectPatientDO::getPrinttime); // 查询患者信息 List patients = patientMapper.selectList(queryWrapper);