Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r16246 -r16304
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 16246)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 16304)
@@ -777,9 +777,17 @@
 
 		String sql = "select count(*) from WashAndDisinfectRecord wadr "
 				+ " where wadr.disinfectIdentification = '"
-				+ CleaningMachineName + "'" + " and "
+				+ CleaningMachineName + "'" + " and (("
 				+ dateQueryAdapter.dateAdapter(startDate)
-				+ " between wadr.startDate and wadr.endDate";
+				+ " between wadr.startDate and wadr.endDate )"
+				+ " or wadr.washStatus = '" + WashAndDisinfectRecord.STATUS_WASHING 
+				+ "' )";
+		
+//		String sql = "select count(*) from WashAndDisinfectRecord wadr "
+//				+ " where wadr.disinfectIdentification = '"
+//				+ CleaningMachineName + "'" + " and "
+//				+ dateQueryAdapter.dateAdapter(startDate)
+//				+ " between wadr.startDate and wadr.endDate ";
 
 		ResultSet result = objectDao.executeSql(sql);
 		try {