Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
===================================================================
diff -u -r26203 -r26208
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java	(.../CustomReportsOfXjjqzyy.java)	(revision 26203)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java	(.../CustomReportsOfXjjqzyy.java)	(revision 26208)
@@ -271,7 +271,7 @@
 		} else {
 			startAndEndDays = dataIndex.getStartAndEndDay(null, null, month);
 		}
-		getWorkQualityCollectionListZsyy(startAndEndDays, list, querySupplyRoom);
+		getWorkQualityCollectionListXjjqzyy(startAndEndDays, list, querySupplyRoom);
 		return list;
 	}
 	/**
@@ -280,7 +280,7 @@
 	 * @param list
 	 * @param querySupplyRoom
 	 */
-	private void getWorkQualityCollectionListZsyy(Map<String, Map<String, String>> startAndEndDays,List<WorkQualityCollection> list,String querySupplyRoom){
+	private void getWorkQualityCollectionListXjjqzyy(Map<String, Map<String, String>> startAndEndDays,List<WorkQualityCollection> list,String querySupplyRoom){
 		if(startAndEndDays == null || list == null){
 			return ;
 		}
@@ -930,7 +930,7 @@
 		//Map<String,Integer>  invoiceOperateAmountMap = workQualityCollectionDataIndex.getInvoiceAmountMap(reportParams,"手术室");
 		// 中大附一的特殊配置
 		//String isXjjqzyyWorkQualityCollectionStr = params.get("isXjjqzyyWorkQualityCollection");
-		return getWorkQualityCollectionListAllyearZsyy(querySupplyRoom,year,recAmountMap,null,packAmountMap,invoiceAmountMap,noEqualsDepartCodequwashAmountMap, equalsDepartCodequwashAmountMap, foreignQuwashAmountMap);
+		return getWorkQualityCollectionListAllyearXjjqzyy(querySupplyRoom,year,recAmountMap,null,packAmountMap,invoiceAmountMap,noEqualsDepartCodequwashAmountMap, equalsDepartCodequwashAmountMap, foreignQuwashAmountMap);
 	}
 	/**
 	 * 中大附一的工作质量持续收集统计报表实现（按年度）
@@ -941,7 +941,7 @@
 	 * @param packingAmountMap
 	 * @return
 	 */
-	private List<WorkQualityCollection> getWorkQualityCollectionListAllyearZsyy(String querySupplyRoom,String year ,Map<String,Integer> recAmountMap,
+	private List<WorkQualityCollection> getWorkQualityCollectionListAllyearXjjqzyy(String querySupplyRoom,String year ,Map<String,Integer> recAmountMap,
 			Map<String,Integer> washAmountMap,Map<String,Integer> packingAmountMap,Map<String,Integer> invoiceAmountMap,Map<String,Integer> noEqualsDepartCodequwashAmountMap, 
 			Map<String,Integer> equalsDepartCodequwashAmountMap, Map<String,Integer> foreignQuwashAmountMap){
 		List<WorkQualityCollection> list = new ArrayList<WorkQualityCollection>();