Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27955 -r27967
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27955)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27967)
@@ -6384,7 +6384,7 @@
 				+ " inner join " + BarcodeDevice.class.getSimpleName()+ " do on bo.id = do.id" 
 				+ " inner join " + TousseDefinition.class.getSimpleName() + " td on bo.tousseDefinition_id=td.id "
 				+ joinMaterialInstanceSql
-				+" where bo.invoice2_id is null " + tousseGroupNameSql + remarkCondition + hospitalNumberSql + " and " + tousseTypeSql;
+				+" where 1=1 " + tousseGroupNameSql + remarkCondition + hospitalNumberSql + " and " + tousseTypeSql;
 		//器械包 二次发货
 		String tousseSql2 = "select '器械包' as type"+querySupplierNameOfTousseDefinition+",po.orgUnitCoding,po.settleAccountsDepart,po.departCoding,po.depart,do.barcode,bo.tousseName as name,"
 				+ tousseAmount + " as amount,bo.price as totalPrice,po.sendTime,po.applicant,'' as batch,'' as externalCode,po.remark as remark,bo.sterileEndTime as sterileEndTime,"
@@ -10225,7 +10225,7 @@
 		
 		//初次发货
 		String sql = " select tousseName,sum(amount) from (select ti.tousseName,count(*) amount from invoice i,TousseInstance ti"
-					 + " where ti.invoice2_id is null and i.id = ti.invoice_id and i.orgUnitCoding = '" + departCoding 
+					 + " where i.id = ti.invoice_id and i.orgUnitCoding = '" + departCoding 
 					 + "' and i.sendTime between "+startTime
 					 + " and "+endTime
 					 + " group by ti.tousseName ";