Merge remote-tracking branch 'origin/main'

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<PatientSupplementVO> getPatientSupplementsByDates(List<LocalDate> 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<InspectPatientDO> 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<InspectPatientDO> patients = patientMapper.selectList(queryWrapper);