Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33524 -r33528
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33524)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33528)
@@ -8029,7 +8029,7 @@
 		try {
 			String monthStr = dateQueryAdapter.dateConverAdapter3("sr.biologicalMonitoringEndDate",mmOrdd);
 			String sterilizationRecordCountSql = "select count(*) count,"+ monthStr +" monthStr from "+ SterilizationRecord.class.getSimpleName() +" sr where sr.biologyResult in('合格','不合格') and sr.orgUnitCoding='"+ querySupplyRoom +"' and sr.biologicalMonitoringEndDate between " + startDay +" and " +endDay + " group by " + monthStr;
-			logger.debug("消毒供应中心年度工作量统计报表灭菌记录中的生物监测结果为合格和不合格的灭菌记录的条数查询:"+ sterilizationRecordCountSql);
+			logger.debug("消毒供应中心年度工作量统计报表灭菌记录中的生物监测结果为合格或不合格的灭菌记录的条数查询:"+ sterilizationRecordCountSql);
 			sterilizationRecordCountRs = objectDao.executeSql(sterilizationRecordCountSql);
 			while (sterilizationRecordCountRs.next()) {
 				Integer sterilizationRecordCount = sterilizationRecordCountRs.getInt("count");
@@ -8364,7 +8364,7 @@
 			addYearWorkLoadBean(20, month, foreignAmountMap, i, "包装外来手术器械总包数", list, yearMonth);
 		}
 		foreignAmountMap = null;
-		//处理湿化瓶总包数 数据获取为：包名称中包含“湿化瓶”字眼的器械包，按照回收数量统计
+		//处理湿化瓶总包数 数据获取为：包名称中包含“湿化瓶”字眼的器械包，按照回收的包数量统计
 		sql = "select sum(ri.amount) amount,"+ dateStr +" monthstr from RecyclingRecord rr join RecyclingItem ri on rr.id=ri.recyclingRecord_id join TousseDefinition td on td.id=ri.tousseDefinitionId "
 				+ " where td.name like '%湿化瓶%'"
 				+ " and rr.orgUnitCoding='" + querySupplyRoom + "' "
@@ -8434,7 +8434,7 @@
 			String yearMonth = yearMonthMap.get(month);
 			addYearWorkLoadBean(25, month, packDressingMaterialAmountMap, i, "处理敷料包总件数", list, yearMonth);
 		}
-		//待灭菌物品包装总数。统计除了消毒物品以外的所有类型的包的包装总数量，按包计算。
+		//待灭菌物品包装总数。统计除了消毒物品以外的所有类型的包的装配总数量，按包计算。
 		params.tousseTypeAndPackageSizeSql= "";
 		params.extraQuery = " and td.tousseType<>'"+ TousseDefinition.PACKAGE_TYPE_DISINFECTION +"' ";
 		params.extraSelectColumns = "";
@@ -8456,7 +8456,7 @@
 		monthlyStr = dateQueryAdapter.dateConverAdapter3("i.sendTime",mmOrdd);
 		params.extraSelectColumns = "," + monthlyStr + " monthStr ";
 		params.extraGroupBy = monthlyStr;
-		// 处理消毒物品总包数
+		// 处理消毒物品总包数 消毒物品发货总包数
 		params.tousseTypeAndPackageSizeSql = " and td.tousseType = '"+ TousseDefinition.PACKAGE_TYPE_DISINFECTION +"' ";
 		sql = "select sum(tl.amount) amount,monthStr from ("
 					+dataIndex.getWorkAmountByPackageSQL("发货数量", params)