Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r30356 -r30370
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 30356)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 30370)
@@ -1397,12 +1397,13 @@
 //				Session session = objectDao.getHibernateSession();
 				if(StringUtils.equals(rs.getDeviceInterface().getDeviceBrand(), DeviceInterface.BELIMED)){
 					
-					// 清洗开始时间和结束时间允许前后5分钟误差
+					// 清洗开始时间和结束时间允许前后10分钟误差
 					Date startTime = sr.getStartDate();
+					Date endTime = sr.getEndDate();
 					Date beginStartTime = new Date(startTime.getTime() - 10*60*1000);
-			        Date endStartTime = new Date(startTime.getTime() + 10*60*1000);
-			        String beginStartTimeStr = DateTools.getFormatDateStr(beginStartTime, "yyyy/MM/dd HH:mm:ss");
-			        String endStartTimeStr = DateTools.getFormatDateStr(endStartTime, "yyyy/MM/dd HH:mm:ss");
+			        Date endStartTime = new Date(endTime.getTime() + 10*60*1000);
+			        String beginStartTimeStr = DateTools.getFormatDateStr(beginStartTime, "yyyy/M/dd HH:mm:ss");
+			        String endStartTimeStr = DateTools.getFormatDateStr(endStartTime, "yyyy/M/dd HH:mm:ss");
 					
 			        String whereSql = String.format(
 							" where po.deviceInterfaceID = %s and  po.machineNo = '%s' and po.time > '%s' and po.time < '%s' order by po.id desc ",
@@ -3367,8 +3368,9 @@
 		
 		// 清洗开始时间和结束时间允许前后5分钟误差
 		Date startTime = wdr.getStartDate();
+		Date endTime = wdr.getEndDate();
 		Date beginStartTime = new Date(startTime.getTime() - 10*60*1000);
-        Date endStartTime = new Date(startTime.getTime() + 10*60*1000);
+        Date endStartTime = new Date(endTime.getTime() + 10*60*1000);
         String beginStartTimeStr =  ForgonDateUtils.safelyFormatDate(beginStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
         String endStartTimeStr = ForgonDateUtils.safelyFormatDate(endStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
         
@@ -3471,10 +3473,11 @@
 		
 		// 清洗开始时间和结束时间允许前后5分钟误差
 		Date startTime = wdr.getStartDate();
+		Date endTime = wdr.getEndDate();
 		Date beginStartTime = new Date(startTime.getTime() - 10*60*1000);
-        Date endStartTime = new Date(startTime.getTime() + 10*60*1000);
-        String beginStartTimeStr = DateTools.getFormatDateStr(beginStartTime, "yyyy/MM/dd HH:mm:ss");
-        String endStartTimeStr = DateTools.getFormatDateStr(endStartTime, "yyyy/MM/dd HH:mm:ss");
+        Date endStartTime = new Date(endTime.getTime() + 10*60*1000);
+        String beginStartTimeStr = DateTools.getFormatDateStr(beginStartTime, "yyyy/M/dd HH:mm:ss");
+        String endStartTimeStr = DateTools.getFormatDateStr(endStartTime, "yyyy/M/dd HH:mm:ss");
 		
         String whereSql = String.format(
 				" where po.deviceInterfaceID = %s and  po.machineNo = '%s' and po.time > '%s' and po.time < '%s' order by po.id desc ",