Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r40986 -r40990 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40986) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40990) @@ -4950,12 +4950,20 @@ //获取当天开始时间 SupplyRoomConfig systemParamsObj = supplyRoomConfigManager.getSystemParamsObj(); String beginStr = null; + String endStr = null; if(systemParamsObj != null && StringUtils.isNotBlank(systemParamsObj.getDayStartTime())){ - beginStr = cDateStr + " " + systemParamsObj.getDayStartTime() +":00"; + beginStr = cDateStr + systemParamsObj.getDayStartTime() +":00"; + // 将开始时间字符串解析为日期对象 + Date beginDate = sdf.parse(beginStr); + // 增加1天 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(beginDate); + calendar.add(Calendar.DATE, 1); + endStr = DateTools.YMDFORMAT.get().format(calendar.getTime()) + " " + systemParamsObj.getDayStartTime() + ":00"; }else{ beginStr = cDateStr + " 00:00:00"; + endStr = cDateStr + " 23:59:59"; } - String endStr = cDateStr + " 23:59:59"; Date bDate = sdf.parse(beginStr); Date eDate = sdf.parse(endStr); String hql = " where ((po.startDate between "