Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r37682 -r37768
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 37682)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 37768)
@@ -73,6 +73,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
+import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceDepartment;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition;
@@ -4067,6 +4068,29 @@
 		String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 		String endDay = StrutsParamUtils.getPraramValue("endDay", "");
 		String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
+		Set<String> settleAccountsDepartCodingSet = SqlUtils.splitStringToSet(StrutsParamUtils.getPraramValue("settleAccountsDepartCoding", ""), ",");	
+		Set<String> tousseTypeSet = SqlUtils.splitStringToSet(StrutsParamUtils.getPraramValue("tousseType", ""), ",");
+		String departGroupStr = StrutsParamUtils.getPraramValue(
+				"departGroup", null);
+		Set<String> departCodingSet = null;
+		if(StringUtils.isNotBlank(departGroupStr)){
+			departCodingSet = new HashSet<String>();
+			Set<String> departGroupIds = null;
+			if(departGroupStr.contains(",")){
+				departGroupIds = SqlUtils.splitStringToSet(departGroupStr, ",");
+			}else{
+				departGroupIds = new HashSet<String>();
+				departGroupIds.add(departGroupStr);
+			}
+			List<InvoiceDepartment> invoiceDepartments = objectDao.findByHql("select po from " + InvoiceDepartment.class.getSimpleName() + " po where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", departGroupIds));
+			for (InvoiceDepartment invoiceDepartment : invoiceDepartments) {
+				if("全部".equals(invoiceDepartment)){
+					break;
+				}
+				Set<String> thisDepartCodings = SqlUtils.splitStringToSet(invoiceDepartment.getDepartCodes(), ";");
+				departCodingSet.addAll(thisDepartCodings);
+			}
+		}
 		String title = "器械包发货统计报表";
 		if (StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)) {
 			title += "(" + startDay + "至" + endDay + ")";
@@ -4083,6 +4107,9 @@
 		map.put("querySql",
 				" and i.sendTime between "
 						+ dateQueryAdapter.dateAdapter(startDay +" 00:00:00") + " and " + dateQueryAdapter.dateAdapter(endDay)
+						+ SqlUtils.getInStringListSql("i.settleAccountsDepartCoding", departCodingSet)
+						+ SqlUtils.getInStringListSql("i.settleAccountsDepartCoding", settleAccountsDepartCodingSet)
+						+ SqlUtils.getInStringListSql("td.tousseType", tousseTypeSet)
 						+ SqlUtils.get_InSql_Extra("i.orgUnitCoding", departCoding));
 		
 		GoodsOption option = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_TOUSSEDELIVER, departCoding);
Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml
===================================================================
diff -u -r28075 -r37768
--- ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml	(.../tousseDeliverStatistics.jrxml)	(revision 28075)
+++ ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml	(.../tousseDeliverStatistics.jrxml)	(revision 37768)
@@ -38,6 +38,7 @@
 		<![CDATA[select depart, amount, goodsName,sequence from(
 	select i.settleAccountsDepart depart, count(*) amount, ti.tousseName goodsName,t.sequence
 	from TousseInstance ti
+    inner join TousseDefinition td on td.id=ti.tousseDefinition_Id
 	inner join  Invoice i on i.id=ti.invoice_id
     left join (select sequence,orgUnitCoding from SupplyRoomConfig src where src.supplyRoomType=3 and src.orgUnitCoding not in (select orgUnitCoding from OrgUnit where status =0)) t on i.settleAccountsDepartCoding=t.orgUnitCoding
     where 1=1 $P!{querySql}
Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jasper
===================================================================
diff -u -r28075 -r37768
Binary files differ