Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17386 -r17387
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17386)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17387)
@@ -13529,14 +13529,14 @@
 							+ " and rr.depart in (" + whereDepart + ") "
 							+ " group by " + dataSql + " , rr.depart " ;
 		
-		String recycleTousseGroupSql = " select " +  dataSql + " ,tdi.tousseGroupName,sum(tItem.amount) from recyclingRecord rr,TousseItem tItem,TousseDefinition tdi"
-										+ " where rr.id = tItem.recyclingRecord_id and tItem.tousseDefinitionId = tdi.id"
+		String recycleTousseGroupSql = " select " +  dataSql + " ,tdi.tousseGroupName,sum(tItem.amount) from recyclingRecord rr,TousseItem tItem,TousseDefinition tdi "
+										+ " where rr.id = tItem.recyclingRecord_id and tItem.tousseName = tdi.name and tdi.forDisplay = 1 "
 										+ " and ( " +  dateQueryAdapter.strDateAreasql("rr.recyclingTime", startDay, endDay, false) + ")"
 										+ " and tdi.tousseGroupName in (" + whereTousseGroup + " )"
 										+ " group by " + dataSql + " , tdi.tousseGroupName";
 		
 		String recycleAmountSql = " select " +  dataSql + ",sum(tItem.amount) from recyclingRecord rr,TousseItem tItem,TousseDefinition tdi "
-											+ " where rr.id = tItem.recyclingRecord_id and tItem.tousseDefinitionId = tdi.id"
+											+ " where rr.id = tItem.recyclingRecord_id and tItem.tousseName = tdi.name and tdi.forDisplay = 1 "
 											+ " and ( " +  dateQueryAdapter.strDateAreasql("rr.recyclingTime", startDay, endDay, false) + ")"
 											+ " and ( tdi.tousseGroupName in (" + whereTousseGroup + ")" + " or rr.depart in (" + whereDepart + ") )"
 											+ " group by " + dataSql ;
@@ -13551,7 +13551,7 @@
 			timeCompareSql = " trunc(iv.sendTime,'hh24') - trunc(iv.recyclingTime,'hh24') > 1";
 		}else{
 			// 按小时计算，单位是小时 超过24小时算次日下送
-			timeCompareSql = " DATEDIFF(HOUR,iv.recyclingTime,iv.sendTime) > 24 ";
+			timeCompareSql = " DATEDIFF(HOUR,iv.recyclingTime,iv.sendTime) >= 24 ";
 		}
 		dataSql = dateQueryAdapter.dateToVarchar1("iv.recyclingTime");
 		// 获取次日下送数量的sql