Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java
===================================================================
diff -u -r30316 -r30699
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java	(.../CustomReportsOfZsyy.java)	(revision 30316)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java	(.../CustomReportsOfZsyy.java)	(revision 30699)
@@ -129,24 +129,24 @@
 		String joinSql = null;
 		String columnSqlForBean4Or6 = null;
 		String joinSqlForBean4= null;
-		String columnSqlForBean5 = null;
-		String joinSqlForBean5 = null;
+		//String columnSqlForBean5 = null;
+		//String joinSqlForBean5 = null;
 		String joinSqlForBean6 = null;
 		if (dataSoureOfMaterialsCountOfToussesInReports == 3) {
 			columnSql = "ri.materialAmount*ri.amount";
 			joinSql = " join TousseDefinition td on td.id=ri.tousseDefinitionId and td.forDisplay=1 ";
 			columnSqlForBean4Or6 = "ritem.amount*ritem.materialAmount";
 			joinSqlForBean4 = " join TousseDefinition td on td.id=ritem.tousseDefinitionId and td.forDisplay=1 and( td.tousseGroupName is null or td.tousseGroupName !='专科') ";
-			columnSqlForBean5 = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*cit.materialAmount";
-			joinSqlForBean5 = " join TousseDefinition td on td.id=cit.tousseDefinitionID and td.forDisplay=1 and td.tousseGroupName = '专科' ";
+			//columnSqlForBean5 = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*cit.materialAmount";
+			//joinSqlForBean5 = " join TousseDefinition td on td.id=cit.tousseDefinitionID and td.forDisplay=1 and td.tousseGroupName = '专科' ";
 			joinSqlForBean6 = " join TousseDefinition td on ritem.tousseDefinitionId=td.id and forDisplay=1 ";
 		} else {
 			columnSql = "tdc.amount*ri.amount";
 			joinSql = " join (select td.id tid, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td where mi.tousse_id=td.id and td.forDisplay=1 group by td.id) tdc  on tdc.tid=ri.tousseDefinitionId ";
 			columnSqlForBean4Or6 = "ritem.amount*tdc.amount";
 			joinSqlForBean4 = " join (select td.id tid,td.name tdName, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td  where mi.tousse_id=td.id and td.forDisplay=1 and( td.tousseGroupName is null or td.tousseGroupName !='专科') group by td.id,td.name) tdc on tdc.tid=ritem.tousseDefinitionId ";
-			columnSqlForBean5 = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*tdc.amount";
-			joinSqlForBean5 = " join (select td.id tid, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td where mi.tousse_id=td.id and td.forDisplay=1 and td.tousseGroupName = '专科' group by td.id) tdc on tdc.tid=cit.tousseDefinitionID ";
+			//columnSqlForBean5 = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*tdc.amount";
+			//joinSqlForBean5 = " join (select td.id tid, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td where mi.tousse_id=td.id and td.forDisplay=1 and td.tousseGroupName = '专科' group by td.id) tdc on tdc.tid=cit.tousseDefinitionID ";
 			joinSqlForBean6 = " join (select td.id tid, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td where mi.tousse_id=td.id and td.forDisplay=1 group by td.id) tdc on tdc.tid=ritem.tousseDefinitionId ";
 		}
 		WorkQualityCollection bean1 = new WorkQualityCollection();
@@ -547,20 +547,20 @@
 		addWorkQualityCollectionBean(list,titleName,sql,recAmountMap);
 		String columnOneOrThree = null;
 		String joinOne = null;
-		String columnTwo = null;
-		String joinTwo = null;
+		//String columnTwo = null;
+		//String joinTwo = null;
 		String joinThree = null;
 		if (dataSoureOfMaterialsCountOfToussesInReports == 3) {
 			columnOneOrThree =   "ritem.amount*ritem.materialAmount";
 			joinOne = " join TousseDefinition td on td.id=ritem.tousseDefinitionId and td.forDisplay=1 and( td.tousseGroupName is null or td.tousseGroupName !=  '专科')";
-			columnTwo = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*cit.materialAmount";
-			joinTwo = " join TousseDefinition td on td.id=cit.tousseDefinitionID and td.forDisplay=1 and td.tousseGroupName = '专科' ";
+			//columnTwo = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*cit.materialAmount";
+			//joinTwo = " join TousseDefinition td on td.id=cit.tousseDefinitionID and td.forDisplay=1 and td.tousseGroupName = '专科' ";
 			joinThree = "";
 		} else {
 			columnOneOrThree = "ritem.amount*tdc.amount";
 			joinOne = " join (select td.id tid, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td  where mi.tousse_id=td.id and td.forDisplay=1 and( td.tousseGroupName is null or td.tousseGroupName !=  '专科') group by td.id) tdc on tdc.tid=ritem.tousseDefinitionId ";
-			columnTwo = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*tdc.amount";
-			joinTwo = " join (select td.id tid, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td where mi.tousse_id=td.id and td.forDisplay=1 and td.tousseGroupName = '专科' group by td.id) tdc on tdc.tid=cit.tousseDefinitionID ";
+			//columnTwo = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*tdc.amount";
+			//joinTwo = " join (select td.id tid, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td where mi.tousse_id=td.id and td.forDisplay=1 and td.tousseGroupName = '专科' group by td.id) tdc on tdc.tid=cit.tousseDefinitionID ";
 			joinThree = " join (select td.id tid, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td where mi.tousse_id=td.id and td.forDisplay=1 group by td.id) tdc on tdc.tid=ritem.tousseDefinitionId ";
 		}
 		String operatingRoomCodes = CssdUtils.getSystemSetConfigByName("operatingRoomCodes");
@@ -955,16 +955,6 @@
 				+ SqlUtils.get_InSql_Extra("rr.orgUnitCoding", querySupplyRoom);
 		return sql;
 	}
-	// 获取清洗总数sql
-	private String getTotalWashSql(String startDay,String endDay,String querySupplyRoom){
-		String sql = "select sum(r.washmaterialamount) from washanddisinfectrecord r "
-				+ "where r.endDate >= "
-				+ dateQueryAdapter.dateAdapter(startDay)
-				+ " and r.endDate <= "
-				+ dateQueryAdapter.dateAdapter(endDay)
-				+ SqlUtils.get_InSql_Extra("r.orgUnitCoding", querySupplyRoom);
-		return sql;
-	}
 	// 获取装配总数sql
 	private String getTotalPackingSql(String startDay,String endDay,String querySupplyRoom){
 		String sql = "select sum(p.amount) from packingrecord p" 
@@ -1065,7 +1055,7 @@
 				.getTousseTypesAndPackageSizesFilterSQL(
 						TousseDefinition.PACKAGE_TYPE_DISINFECTION, null);
 		
-		Map<String, Integer> packDisinfectAmountMap = workQualityCollectionDataIndex.getPackAmountMap(reportParams);
+		//Map<String, Integer> packDisinfectAmountMap = workQualityCollectionDataIndex.getPackAmountMap(reportParams);
 		
 		reportParams.tousseTypes = "";
 		reportParams.tousseTypeAndPackageSizeSql = "";
@@ -1074,15 +1064,15 @@
 		// 灭菌总数的Map
 //		Map<String,Integer>  sterilizationAmountMap = getSterilizationAmountMap(reportParams);
 		// 灭菌记录条数的Map
-		Map<String,Integer>  sterilizationRecordAmountMap = workQualityCollectionDataIndex.getSterilizationRecordAmountMap(reportParams);
+		//Map<String,Integer>  sterilizationRecordAmountMap = workQualityCollectionDataIndex.getSterilizationRecordAmountMap(reportParams);
 		// 发货数量的Map
-		Map<String,Integer>  invoiceAmountMap = workQualityCollectionDataIndex.getInvoiceAmountMap(reportParams,"");
+		//Map<String,Integer>  invoiceAmountMap = workQualityCollectionDataIndex.getInvoiceAmountMap(reportParams,"");
 		
 		// TODO:此处手术室的名称为硬编码，要修改才行
 		// 手术室发货数量的Map
-		Map<String,Integer>  invoiceOperateAmountMap = workQualityCollectionDataIndex.getInvoiceAmountMap(reportParams,"手术室");
+		//Map<String,Integer>  invoiceOperateAmountMap = workQualityCollectionDataIndex.getInvoiceAmountMap(reportParams,"手术室");
 		// 中大附一的特殊配置
-		String isZSYYWorkQualityCollectionStr = params.get("isZSYYWorkQualityCollection");
+		//String isZSYYWorkQualityCollectionStr = params.get("isZSYYWorkQualityCollection");
 		return getWorkQualityCollectionListAllyearZsyy(querySupplyRoom,year,recAmountMap,washAmountMap,packAmountMap,dataSoureOfMaterialsCountOfToussesInReports);
 	}