Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/WashReportHelper.java
===================================================================
diff -u -r37498 -r37501
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/WashReportHelper.java	(.../WashReportHelper.java)	(revision 37498)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/WashReportHelper.java	(.../WashReportHelper.java)	(revision 37501)
@@ -405,7 +405,7 @@
 		//查询条件
 		StringBuffer queryCondition = new StringBuffer();
 		queryCondition.append(" where ");
-		queryCondition.append(dateQueryAdapter.dateAreaSql("alias.endDate", startDate + " 00:00:00", endDate + " 23:59:59"));
+		queryCondition.append(dateQueryAdapter.dateAreaSql("alias.startDate", startDate + " 00:00:00", endDate + " 23:59:59"));
 		if(StringUtils.isNotBlank(querySupplyRoom)){
 			queryCondition.append(SqlUtils.get_InSql_Extra("alias.orgUnitCoding", querySupplyRoom));
 		}
@@ -453,12 +453,7 @@
 			+ " join ClassifyBasket_WashRecord cw on cw.WashAndDisinfectRecord_ID=wr.id"
 			+ " join ClassifyBasket cb on cw.ClassifyBasket_ID=cb.id"
 			+ " join ClassifiedItem ci on ci.classifybasket_id=cb.id"
-			+ " where ci.itemType<>'材料' "
-			+ " union all select wr.orgUnitCoding,r.name rinserName, wr.disinfectProgram disinfectProgram, md.name tousseName, wrm.amount , 0,wr.startDate,wr.endDate,wr.operator "
-			+ " from WashAndDisinfectRecord wr join rinser r on wr.rinserId = r.id "
-			+ " inner join WashRecord_WashMaterial wm on wm.WashAndDisinfectRecord_ID = wr.id "
-			+ " inner join WashAndDisinfectRecordMaterial wrm on wrm.id = wm.WashAndDisinfectMaterial_ID "
-			+ " inner join MaterialDefinition md on wrm.materialDefinition_id = md.id"
+			+ " where ci.itemType in('"+ TousseDefinition.PACKAGE_TYPE_INSIDE +"','"+ TousseDefinition.PACKAGE_TYPE_DISINFECTION + "')"
 			+ " union all select wr.orgUnitCoding,r.name rinserName, wr.disinfectProgram disinfectProgram,null tousseName,wrm.amount tousseAmount,0 tousseAmount2, wr.startDate,wr.endDate,wr.operator "
 			+ " from "+ WashAndDisinfectRecord.class.getSimpleName() +" wr inner join WashRecord_WashMaterial wm on wm.WashAndDisinfectRecord_ID = wr.id "
 			+ " inner join "+ WashAndDisinfectRecordMaterial.class.getSimpleName() +" wrm on wrm.id = wm.WashAndDisinfectMaterial_ID inner join "+ MaterialDefinition.class.getSimpleName() +" md on wrm.materialDefinition_id = md.id inner join "+ Rinser.class.getSimpleName() +" r on r.id=wr.rinserId) alias" + queryCondition.toString()