Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r28781 -r28829
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 28781)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 28829)
@@ -1536,33 +1536,23 @@
 		public int getNextCycleCounter(String rinserName) {
 			if( rinserName == null )
 				return 1;
-			Session session = objectDao.getHibernateSession();
+			/*Session session = objectDao.getHibernateSession();
 			String queryString = "select r from Rinser r"
 					+ " where r.name = :rinserName";
 			Query query = session.createQuery(queryString);
 			query.setParameter("rinserName", rinserName);
-			Rinser rinser = (Rinser)query.uniqueResult();
+			Rinser rinser = (Rinser)query.uniqueResult();*/
 			ResultSet rs = null;
 			try{
 				int c1 = 0;
-				int c2 = 0;
 				String sql = "select max(wr.cycleCounter) from WashAndDisinfectRecord wr"
 						+ " where wr.disinfectIdentification = '"
 						+ rinserName + "'";
 				rs = objectDao.executeSql(sql);
 				if (rs != null && rs.next()) {
 					c1 = (int) rs.getLong(1) + 1;
 				}
-				sql = "select max(wd.cycleCounter) from WashData wd"
-						+ " where wd.machineNo = '"
-						+ rinser.getMachineNumber()
-						+ "' and wd.deviceInterfaceID = '"
-						+ rinser.getDeviceInterfaceId() + "'";
-				rs = objectDao.executeSql(sql);
-				if (rs != null && rs.next()) {
-					c2 = (int) rs.getLong(1) + 1;
-				}
-				return Math.max(c1, c2);
+				return c1;
 			}catch(Exception e)
 			{
 				e.printStackTrace();