Index: ssts-recallrecord/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java =================================================================== diff -u -r41346 -r41347 --- ssts-recallrecord/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 41346) +++ ssts-recallrecord/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 41347) @@ -866,14 +866,15 @@ //获取指定时间指定灭菌炉炉次的灭菌记录 SterilizationRecord sterilizationRecord = sterilizationRecordManager.getSterilizationRecordByFrequency(dates[0], dates[1] , sterilizerId, sterilizingFrequency); if(sterilizationRecord == null){ - throw new SystemException(ymd + sterilizer.getName() + "不存在炉次为" + sterilizingFrequency + "的灭菌记录"); + throw new SystemException(sterilizer.getName() + "不存在灭菌结束时间为"+ ymd +",炉次为" + sterilizingFrequency + "的灭菌记录"); } if(!SterilizationRecord.STERILIZATION_STATUS_END.equals(sterilizationRecord.getStatus())){ - throw new SystemException(ymd + sterilizer.getName() + "炉次为" + sterilizingFrequency + "的灭菌记录状态为"+ sterilizationRecord.getStatus() +",不为灭菌完成"); + throw new SystemException(sterilizer.getName() + "灭菌结束时间为"+ ymd +",炉次为" + sterilizingFrequency + "的灭菌记录状态为"+ sterilizationRecord.getStatus() +",不为灭菌完成"); } - if(sterilizationRecord.getEndDate() == null){ - throw new SystemException(ymd + sterilizer.getName() + "炉次为" + sterilizingFrequency + "的灭菌记录未结束"); + if(!SterilizationRecord.MONITOR_RESULT_UNQUALIFIED.equals(sterilizationRecord.getBiologyResult())){ + throw new SystemException("灭菌记录的生物监测结果不为“不合格”,无法搜索物品。"); } + if(!SterilizationRecord.MONITOR_RESULT_UNQUALIFIED.equals(sterilizationRecord.getBiologyResult())){ throw new SystemException("灭菌记录的生物监测结果不为“不合格”,无法搜索物品。"); }