Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r30432 -r30437
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 30432)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 30437)
@@ -21805,11 +21805,7 @@
 			}else{
 				querySupplyRoomSql = "";
 			}
-			String betweenSql = "between "
-					+ dateQueryAdapter.dateConverAdapter2(startDate,
-							"yyyy-mm-dd HH24:MI:SS")
-					+ " and " + dateQueryAdapter.dateConverAdapter2(endDate,
-							"yyyy-mm-dd HH24:MI:SS") + " ";
+			String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDate + " 00:00:00"),dateQueryAdapter.dateAdapter(endDate + " 23:59:59"));
 			StringBuilder sbrSql = new StringBuilder(1500);
 			sbrSql.append(" select td.packageSize,td.tousseType,case when proxyDisinfection_id is null then 0 else 1 end isProxy,count(0) amount from ")
 			.append(TousseInstance.class.getSimpleName())
@@ -21826,7 +21822,7 @@
 			//聚合包不算
 			.append("and ti.comboTousseDefinitionId is null and ti.comboTousseInstanceId is null ")
 			.append("group by td.packageSize,td.tousseType,proxyDisinfection_id ")
-			.append("select td.packageSize,td.tousseType,case when proxyDisinfection_id is null then 0 else 1 end isProxy,count(0) amount from ")
+			.append("union all select td.packageSize,td.tousseType,case when proxyDisinfection_id is null then 0 else 1 end isProxy,count(0) amount from ")
 			.append(TousseInstance.class.getSimpleName())
 			.append(" ti join ")
 			.append(Invoice.class.getSimpleName())