Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34356 -r34363
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34356)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34363)
@@ -27501,12 +27501,8 @@
 		ReportQueryParams params = new ReportQueryParams(objectDao);
 		params.betweenSql = betweenSql;
 		params.querySupplyRoom = orgUnitCoding;
-		//1.计算申请科室分组为【内部代理灭菌】的【代理灭菌】处理【包数】 2.计算申请科室分组为【临床外部代理灭菌】的【外部代理灭菌】处理【包数】 取数为两者总和
-		params.extraQuery = " and ( 1=1 "
-				+ getProxydisinfectionOrgUnitGroupSql("内部代理灭菌")
-				+ " or  1=1 "
-				+ getForeignproxyOrgUnitGroupSql("临床外部代理灭菌")
-				+ ") ";
+		//消毒班 1.计算申请科室分组为【内部代理灭菌】的【代理灭菌】处理【包数】 2.计算申请科室分组为【临床外部代理灭菌】的【外部代理灭菌】处理【包数】 取数为两者总和
+		params.extraQuery = getProxydisinfectionOrgUnitGroupSql("二沙分院,芳村分院,大学城分院");
 		params.extraSelectColumns = "  ,case when proxydisinfection_id is not null then (select depart from invoicePlan where id=ti.proxydisinfection_id ) else ti.depart end depart ";
 		params.extraGroupBy = " group by ti.proxydisinfection_id,ti.depart ";
 		//灭菌记录
@@ -27590,7 +27586,7 @@
 				+ ") tl group by tl.depart ");
 		//④布类班 统计处理科室为【大院供应室】装配任务组为【布类班】科室分组为【内部代理灭菌】器械包种类为【手术布类包】的【装配】的【包数】X1
 		params.extraQuery = getInstrumentSetTypeSql("手术布类包","in") 
-				+ getInOrgUnitGroupSql("ti.departCoding", "内部代理灭菌");
+				+ getInOrgUnitGroupSql("ti.departCoding", "二沙分院,芳村分院,大学城分院");
 		params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and tdc.taskGroup='布类班' ";
 		sql += String.format(" union all select tl.depart,sum(tl.amount) amount from ("
 				+dataIndex.getWorkAmountByPackageSQL("配包数量", params)