Index: ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java =================================================================== diff -u -r35590 -r35728 --- ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 35590) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 35728) @@ -69,6 +69,7 @@ import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; +import com.forgon.tools.util.ForgonDateUtils; import com.forgon.util.SqlUtils; /** @@ -321,13 +322,19 @@ String sterilizingFrequency_start) { List instances = new ArrayList(); if (StringUtils.isNotBlank(sterileName)) { + //根据开始时间和开始炉次查找第一条符合条件的灭菌记录的完成时间 Date begin = sterilizationRecordManager.findBeginTimeForRecall( sterileName, startDate, sterilizingFrequency_start); if (begin != null) { + //如果该灭菌记录的完成时间晚于查询条件的截止时间时,表示未找到任务灭菌的物品,直接返回空集合 + if(begin.after(ForgonDateUtils.safelyParseDate(endDate))){ + return instances; + } Date end = sterilizationRecordManager.findEndTimeForRecall( sterileName, endDate, sterilizingFrequency_end); if (end == null) { - end = new Date(); + //end = new Date(); + return instances; } List sterilizationRecords = sterilizationRecordManager .findRecordInTimePart(sterileName, begin, end);