Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r30445 -r30446
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 30445)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 30446)
@@ -1650,9 +1650,9 @@
 							+ "and po.time > '" + beginStartTimeStr + "' and po.time < '" + endStartTimeStr + "'";
 				}
 			}else if(StringUtils.equals(devInterface.getDeviceBrand(), DeviceInterface.BELIMED)){
-				// 倍力曼清洗机根据清洗记录的开始结束时间匹配清洗数据(时间格式为"yyyy/MM/dd HH:mm:ss")
-				 String beginStartTimeStr = DateTools.getFormatDateStr(beginStartTime, "yyyy/MM/dd HH:mm:ss");
-			     String endStartTimeStr = DateTools.getFormatDateStr(endStartTime, "yyyy/MM/dd HH:mm:ss");
+				// 倍力曼清洗机根据清洗记录的开始结束时间匹配清洗数据(时间格式为"yyyy/M/dd HH:mm:ss")
+				 String beginStartTimeStr = DateTools.getFormatDateStr(beginStartTime, "yyyy/M/dd HH:mm:ss");
+			     String endStartTimeStr = DateTools.getFormatDateStr(endStartTime, "yyyy/M/dd HH:mm:ss");
 			     queryString = "select count(*) c from "+ WashData.class.getSimpleName() + " po "
 						+ "where po.deviceInterfaceID = " + devInterface.getId() + " and  po.machineNo = '" + machineNo + "' "
 						+ "and po.time > '" + beginStartTimeStr + "' and po.time < '" + endStartTimeStr + "'";
@@ -3470,9 +3470,9 @@
         String beginStartTimeStr =  ForgonDateUtils.safelyFormatDate(beginStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
         String endStartTimeStr = ForgonDateUtils.safelyFormatDate(endStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
         
-		String whereSql = String.format(" where po.deviceInterfaceID = %s and  po.machineNo = '%s' and %s ",
-				deviceInterfaceId,machineNo,dateQueryAdapter.dateAreaSql("po.cycleStartTime", beginStartTimeStr, endStartTimeStr, false));
-		List<WashDataOfBelimed> washDataList = objectDao.findByHql(whereSql);
+		String whereSql = String.format(" from %s po where po.deviceInterfaceID = %s and  po.machineNo = '%s' and %s ",
+				WashDataOfBelimed.class.getSimpleName(), deviceInterfaceId,machineNo,dateQueryAdapter.dateAreaSql("po.cycleStartTime", beginStartTimeStr, endStartTimeStr, false));
+   		List<WashDataOfBelimed> washDataList = objectDao.findByHql(whereSql);
 		if(CollectionUtils.isNotEmpty(washDataList)){
 			return washDataList.get(0);
 		}
@@ -3597,7 +3597,7 @@
         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 ",
+				" where po.deviceInterfaceID = %s and  po.machineNo = '%s' and po.time > '%s' and po.time < '%s' order by po.time ",
 				deviceInterfaceId, machineNo, beginStartTimeStr, endStartTimeStr);
         
 		List<WashData> washDatas = objectDao.findBySql(WashData.class.getSimpleName(), whereSql);