Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18066 -r18088
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18066)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18088)
@@ -15024,7 +15024,7 @@
 			String sql = String.format("select oro.id operationRoomId,oro.orgUnitName orgUnitName,oro.operationRoomName,ore.id operationReservationId,ore.operationTime,ore.consoleName,ti.tousseName,ti.amount "
 					+ "from OperationReservation ore join TousseItem ti on ti.recyclingApplication_ID=ore.id "
 					+ "join OperationRoom oro on oro.operationRoomName=ore.operatingRoom "
-					+ "where %s %s order by ore.operationTime", betweenSql, operatingRoomSql);
+					+ "where %s %s and oro.isInvoice='%s' order by ore.operationTime", betweenSql, operatingRoomSql, Constants.STR_YES);
 			ResultSet result = objectDao.executeSql(sql);
 			
 			Map<String, OperationReservationDetail_main> map1 = new LinkedHashMap<String, OperationReservationDetail_main>();
@@ -15136,8 +15136,8 @@
 			String sql = String.format("select oro.id operationRoomId,oro.orgUnitName,oro.operationRoomName,ore.id operationReservationId,ore.operationTime,ti.tousseName,sum(ti.amount) amount "
 					+ "from OperationReservation ore join TousseItem ti on ti.recyclingApplication_ID=ore.id "
 					+ "join OperationRoom oro on oro.operationRoomName=ore.operatingRoom "
-					+ "where %s %s group by oro.id,oro.orgUnitName,oro.operationRoomName,ore.id,ore.operationTime,ti.tousseName order by ore.operationTime",
-					betweenSql, operatingRoomSql);
+					+ "where %s %s and oro.isInvoice='%s' group by oro.id,oro.orgUnitName,oro.operationRoomName,ore.id,ore.operationTime,ti.tousseName order by ore.operationTime",
+					betweenSql, operatingRoomSql, Constants.STR_YES);
 			ResultSet result = objectDao.executeSql(sql);
 			
 			Map<String, OperationReservationSum_main> map1 = new LinkedHashMap<String, OperationReservationSum_main>();