Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r34324 -r34336
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 34324)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 34336)
@@ -4293,7 +4293,7 @@
 	private List<WashData> getWashDatasByCycleCounter(Long deviceInterfaceId, Long cycleCounter,
 		String machineNo) {
 		String whereSql = String.format(
-				" where po.deviceInterfaceID = %s and  po.machineNo = '%s' and po.cycleCounter = %s order by po.time ",
+				" where po.deviceInterfaceID = %s and  po.machineNo = '%s' and po.cycleCounter = %s order by po.id ",
 				deviceInterfaceId,machineNo,cycleCounter);
 		List<WashData> washDatas = objectDao.findBySql(WashData.class.getSimpleName(), whereSql);
 		return washDatas;
@@ -4995,9 +4995,10 @@
 			}
 		}
 		if(MapUtils.isNotEmpty(washDataMap)){
-			for (WashData washData : washDataMap.values()) {
-				result.add(washData);
+			for (String key : washDataMap.keySet()) {
+				result.add(washDataMap.get(key));
 			}
+			
 		}
 		return result;
 	}