Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34374 -r34376
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34374)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34376)
@@ -27330,14 +27330,17 @@
                          +  " from (select ip.depart, sr.id from SterilizationRecord sr "
                          +  " join TousseInstance ti on ti.sterilizationRecord_id = sr.id "
                          +  " join invoicePlan ip on ip.id = ti.invoicePlanID "
-                         +  " where ti.foreignProxyItem_id is not null "
+                         +  " where ti.foreignProxyItem_id is not null and ti.combotousseinstanceid is null and ti.combotoussedefinitionid is null"
                          +  " union all select ip.depart, sr.id "
                          +  " from SterilizationRecord sr join TousseInstance ti on ti.sterilizationRecord_id = sr.id "
                          +  " join invoicePlan ip on ip.id = ti.proxyDisinfection_id "
-                         +  " where ti.proxyDisinfection_id is not null "
+                         +  " where ti.proxyDisinfection_id is not null and ti.combotousseinstanceid is null and ti.combotoussedefinitionid is null"
                          +  " union all select ti.depart, sr.id  from SterilizationRecord sr "
                          +  " join TousseInstance ti  on ti.sterilizationRecord_id = sr.id "
-                         +  " where ti.proxyDisinfection_id is null and ti.foreignProxyItem_id is null "
+                         +  " where ti.proxyDisinfection_id is null and ti.foreignProxyItem_id is null and ti.combotousseinstanceid is null and ti.combotoussedefinitionid is null"
+                         +  " union all select ti.depart, sr.id  from SterilizationRecord sr "
+                         +  " join TousseInstance ti on ti.sterilizationRecord_id = sr.id join toussedefinition td on td.id=ti.toussedefinition_id where  "
+                         +  " td.tousseTyepe='"+ TousseDefinition.PACKAGE_TYPE_COMBO +"' "
                          +  " ) te ) te2  where te2.bhname in ('芳村分院', '二沙分院', '大学城分院')  group by id, bhName "
                          +  " order by id desc, count desc,  case when bhName = '大学城分院' then 3 when bhName = '芳村分院' then  2 when bhName = '二沙分院' then 1 else 0 end desc） "
                 		 +  " t ) inn WHERE inn.num=1 ";
@@ -27362,7 +27365,6 @@
 		resultList.add(vo2);
 		resultList.add(vo3);
 		try {
-			String sql2 = getSteAmountEachBranchReportDataSql(startTime, endTime);
 			rs = objectDao.executeSql(sql);
 			while(rs.next()){
 				String bhname = rs.getString("bhname");