Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35761 -r35769
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35761)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35769)
@@ -2321,10 +2321,6 @@
 		 */
 		private boolean hasDisinfection;
 		/**
-		 * 任务组
-		 */
-		private String taskGroup;
-		/**
 		 * 供应室
 		 */
 		private String querySupplyRoom;
@@ -13399,8 +13395,14 @@
 				if(MapUtils.isNotEmpty(groupAndDepartMap)){
 					Map<String,Integer> groupNameAmountMap = dateAmountMapOfDepartGroup.get(thisStartDate);
 					for (String groupName : groupAndDepartMap.keySet()) {
+					    Integer amount = null;
+					    if(MapUtils.isNotEmpty(groupNameAmountMap) && groupNameAmountMap.containsKey(groupName)){
+                            amount = groupNameAmountMap.get(groupName);
+                        }else{
+                            amount = 0;
+                        }
 						CrossTableBean ctBean8 = getCrossTableBean(groupName,titleColumnNumMap,thisStartDate
-								,MapUtils.isEmpty(groupNameAmountMap) || !groupNameAmountMap.containsKey(groupName)?0:groupNameAmountMap.get(groupName)
+								,amount
 								,null);
 						if(ctBean8 != null){
 							ctBeanList.add(ctBean8);
@@ -30683,7 +30685,7 @@
 				+ getToBeRecycledAmountSql(handleDepartCoding, tousseTypesql, toBeBetweenSql, true) + ") tb ";
 		sql += " union all " + foreignToBeRecycledAmountSql;
 		//外来器械当天已回收包数量
-		foreignParams.extraQuery = " and rr.recyclingTime is null ";
+		foreignParams.extraQuery = " and rr.recyclingTimes is null ";
 		String foreignRecycledAmountSql = String.format("select 'foreignRecycledAmount' type,sum(amount) amount,0 urgentAmount from ("
 				+dataIndex.getWorkAmountByPackageSQL("回收数量", foreignParams)
 				+ ") tl");