Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r23757 -r23791
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23757)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23791)
@@ -9301,8 +9301,8 @@
 			endDay = dateQueryAdapter.dateAdapter(endDay);
 			
 			String month = year + "-" + monthFormart;
-			String sql = "select sum(generalMaterialAmount + operateMaterialAmount + foreignMaterialAmount)  as tousseAmount "
-					   +",sum(foreignMaterialAmount) as foreignMaterialAmount from WashAndDisinfectRecord w "
+			String sql = "select sum((case when generalMaterialAmount is null then 0 else generalMaterialAmount end) + (case when operateMaterialAmount is null then 0 else operateMaterialAmount end) + (case when foreignMaterialAmount is null then 0 else foreignMaterialAmount end))  as tousseAmount "
+					   +",sum(case when foreignMaterialAmount is null then 0 else generalMaterialAmount end) as foreignMaterialAmount from WashAndDisinfectRecord w "
 					   +" where w.endDate between "+ startDay +" and "+endDay
 					   +" and w.orgUnitCoding = '"+querySupplyRoom+"'";
 			
@@ -12388,7 +12388,10 @@
 		String taskGroupSql2 = "";
 		if (StringTools.isNotBlank(taskGroup)) {
 			taskGroupSql = String.format(" and td.taskGroup='%s' ", taskGroup);
-			if (!StringTools.equals(taskGroup, systemParamsObj.getDefalutTaskGroup())) {
+			SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+			//外来器械包默认处理科室及任务组
+			JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = supplyRoomConfig.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(AcegiHelper.getCurrentOrgUnitCode());
+			if (foreignTousseHandleDepartAndTaskGroupJsonobject == null || !StringTools.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup"))) {
 				taskGroupSql2 = " and 1=2 ";
 			}
 		}
@@ -12660,7 +12663,12 @@
 		if(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)
 				&& StringUtils.isNotBlank(departmentCode)){
 			SupplyRoomConfig systemParamsObj = supplyRoomConfigManager.getSystemParamsObj();
-			String defalutTaskGroup = systemParamsObj.getDefalutTaskGroup();							//外来器械包的默认装配组
+			//外来器械包默认处理科室及任务组
+			String defalutTaskGroup = null;
+			JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = systemParamsObj.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(AcegiHelper.getCurrentOrgUnitCode());
+			if(foreignTousseHandleDepartAndTaskGroupJsonobject != null){
+				defalutTaskGroup = foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup");
+			}
 			String customTousseDefaultTaskGroup = systemParamsObj.getCustomTousseDefaultTaskGroup();	//自定义器械包的默认装配组
 			
 			//1、按装配任务的开始时间过滤