Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r40583 -r40606
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 40583)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 40606)
@@ -7123,9 +7123,11 @@
 			}else{
 				queryString+=" and wd.cycleCounter = '"+ cycleCounter +"' " ;
 			}
+			queryString += " order by wd.id asc ";
 			query = session.createQuery(queryString);
 			query.setParameter("rinserId", rs.getId());
-			WashAndDisinfectRecord wd = (WashAndDisinfectRecord)query.uniqueResult();
+			List<WashAndDisinfectRecord> wds = objectDao.findByHql(queryString, 0, 1);
+			WashAndDisinfectRecord wd = CollectionUtils.isEmpty(wds)?null:wds.get(0);
 			if(wd != null){
 				if(washDataAmount == null){
 					int amounts = getWashAndDisinfectRecordsCount(deviceInterface.getId().toString(),machineNo,wd);