Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r33385 -r33639
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 33385)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 33639)
@@ -450,7 +450,7 @@
 		endDateTime = obj.endDateTime;
 	});
 	DWREngine.setAsync(true);
-	
+	var hiddenGroup = sstsConfig.disableGroupFilterInPackingPrintRecyclingDetails?true:false;
 	var formPanel = new Ext.FormPanel({
 		id : 'form',
 		frame : true,
@@ -517,14 +517,17 @@
 			},{
 				columnWidth : 0.5,
 				layout : 'form',
+				hidden:hiddenGroup,
 				items : [taskGroupItem]
 			},{
 				columnWidth : 0.5,
 				layout : 'form',
+				hidden:hiddenGroup,
 				items : [tousseGroupItem]
 			},{
 				columnWidth : 0.5,
 				layout : 'form',
+				hidden:hiddenGroup,
 				items : [deptGroupItem]
 			}]
 		} ],
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r33627 -r33639
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 33627)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 33639)
@@ -1467,34 +1467,39 @@
 
 				fromTime = dateQueryAdapter.dateAdapter(fromTime);
 				toTime = dateQueryAdapter.dateAdapter(toTime);
-				String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
-				String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
-				String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
+				boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false);
 				String orgUnitCodingSql = "";
-				if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
-					if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
-						List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
-						if(CollectionUtils.isNotEmpty(departmentGroups)){
-							Set<String> departCodes = new HashSet<String>();
-							for (DepartmentGroup departmentGroup : departmentGroups) {
-								String depart = departmentGroup.getDepartCodes();
-								if(StringUtils.isNotBlank(depart)){
-									if(depart.contains(";")){
-										String[] departArr = depart.split(";");
-										for (int i = 0; i < departArr.length; i++) {
-											departCodes.add(departArr[i]);
+				String taskGroups = "";
+				String tousseGroupIds = "";
+				if(!disableGroupFilterInPackingPrintRecyclingDetails){
+					taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
+					tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
+					String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
+					if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
+						if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
+							List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
+							if(CollectionUtils.isNotEmpty(departmentGroups)){
+								Set<String> departCodes = new HashSet<String>();
+								for (DepartmentGroup departmentGroup : departmentGroups) {
+									String depart = departmentGroup.getDepartCodes();
+									if(StringUtils.isNotBlank(depart)){
+										if(depart.contains(";")){
+											String[] departArr = depart.split(";");
+											for (int i = 0; i < departArr.length; i++) {
+												departCodes.add(departArr[i]);
+											}
+										}else{
+											departCodes.add(depart);
 										}
-									}else{
-										departCodes.add(depart);
 									}
 								}
+								if(departCodes.size() > 0){
+									orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("departCode", departCodes, " 1=1 ");
+								}
 							}
-							if(departCodes.size() > 0){
-								orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("departCode", departCodes, " 1=1 ");
-							}
+						}else{
+							orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("departCode", recyDepartmentGroupDepartCodes, ";");
 						}
-					}else{
-						orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("departCode", recyDepartmentGroupDepartCodes, ";");
 					}
 				}
 				String sql = "where po.recyclingTime between " + fromTime
@@ -1562,47 +1567,52 @@
 			fromTime = dateQueryAdapter.dateAdapter(fromTime);
 			toTime = dateQueryAdapter.dateAdapter(toTime);
 			List<DepartmentGroup> departGroups = departmentGroupManager.getAll();
-			String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
-			String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
-			String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
-			String taskGroupsSql = null;
-			if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
-				taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
-			}else{
-				taskGroupsSql = "";
-			}
-			String tousseGroupIdsSql = null;
-			if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
-				tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
-			}else{
-				tousseGroupIdsSql = "";
-			}
-			String tdSql = taskGroupsSql + tousseGroupIdsSql;
+			
+			boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false);
+			String tdSql = "";
 			String orgUnitCodingSql = "";
-			if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
-				if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
-					List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
-					if(CollectionUtils.isNotEmpty(departmentGroups)){
-						Set<String> departCodes = new HashSet<String>();
-						for (DepartmentGroup departmentGroup : departmentGroups) {
-							String depart = departmentGroup.getDepartCodes();
-							if(StringUtils.isNotBlank(depart)){
-								if(depart.contains(";")){
-									String[] departArr = depart.split(";");
-									for (int i = 0; i < departArr.length; i++) {
-										departCodes.add(departArr[i]);
+			if(!disableGroupFilterInPackingPrintRecyclingDetails){
+				String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
+				String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
+				String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
+				String taskGroupsSql = null;
+				if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
+					taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
+				}else{
+					taskGroupsSql = "";
+				}
+				String tousseGroupIdsSql = null;
+				if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
+					tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
+				}else{
+					tousseGroupIdsSql = "";
+				}
+				tdSql = taskGroupsSql + tousseGroupIdsSql;
+				if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
+					if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
+						List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
+						if(CollectionUtils.isNotEmpty(departmentGroups)){
+							Set<String> departCodes = new HashSet<String>();
+							for (DepartmentGroup departmentGroup : departmentGroups) {
+								String depart = departmentGroup.getDepartCodes();
+								if(StringUtils.isNotBlank(depart)){
+									if(depart.contains(";")){
+										String[] departArr = depart.split(";");
+										for (int i = 0; i < departArr.length; i++) {
+											departCodes.add(departArr[i]);
+										}
+									}else{
+										departCodes.add(depart);
 									}
-								}else{
-									departCodes.add(depart);
 								}
 							}
+							if(departCodes.size() > 0){
+								orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCode", departCodes, " 1=1 ");
+							}
 						}
-						if(departCodes.size() > 0){
-							orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCode", departCodes, " 1=1 ");
-						}
+					}else{
+						orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.departCode", recyDepartmentGroupDepartCodes, ";");
 					}
-				}else{
-					orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.departCode", recyDepartmentGroupDepartCodes, ";");
 				}
 			}
 			if(CollectionUtils.isNotEmpty(departGroups)){
@@ -1684,47 +1694,51 @@
 					orOrgUnitNameSQL = " and po.depart not in ('" + goodsOption.getValue().replace(";", "','") + "')";
 				}
 			}
-			String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
-			String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
-			String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
-			String taskGroupsSql = null;
-			if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
-				taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
-			}else{
-				taskGroupsSql = "";
-			}
-			String tousseGroupIdsSql = null;
-			if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
-				tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
-			}else{
-				tousseGroupIdsSql = "";
-			}
-			String tdSql = taskGroupsSql + tousseGroupIdsSql;
+			boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false);
+			String tdSql = "";
 			String orgUnitCodingSql = "";
-			if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
-				if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
-					List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
-					if(CollectionUtils.isNotEmpty(departmentGroups)){
-						Set<String> departCodes = new HashSet<String>();
-						for (DepartmentGroup departmentGroup : departmentGroups) {
-							String depart = departmentGroup.getDepartCodes();
-							if(StringUtils.isNotBlank(depart)){
-								if(depart.contains(";")){
-									String[] departArr = depart.split(";");
-									for (int i = 0; i < departArr.length; i++) {
-										departCodes.add(departArr[i]);
+			if(!disableGroupFilterInPackingPrintRecyclingDetails){
+				String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
+				String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
+				String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
+				String taskGroupsSql = null;
+				if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
+					taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
+				}else{
+					taskGroupsSql = "";
+				}
+				String tousseGroupIdsSql = null;
+				if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
+					tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
+				}else{
+					tousseGroupIdsSql = "";
+				}
+				tdSql = taskGroupsSql + tousseGroupIdsSql;
+				if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
+					if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
+						List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
+						if(CollectionUtils.isNotEmpty(departmentGroups)){
+							Set<String> departCodes = new HashSet<String>();
+							for (DepartmentGroup departmentGroup : departmentGroups) {
+								String depart = departmentGroup.getDepartCodes();
+								if(StringUtils.isNotBlank(depart)){
+									if(depart.contains(";")){
+										String[] departArr = depart.split(";");
+										for (int i = 0; i < departArr.length; i++) {
+											departCodes.add(departArr[i]);
+										}
+									}else{
+										departCodes.add(depart);
 									}
-								}else{
-									departCodes.add(depart);
 								}
 							}
+							if(departCodes.size() > 0){
+								orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCode", departCodes, " 1=1 ");
+							}
 						}
-						if(departCodes.size() > 0){
-							orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCode", departCodes, " 1=1 ");
-						}
+					}else{
+						orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.departCode", recyDepartmentGroupDepartCodes, ";");
 					}
-				}else{
-					orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.departCode", recyDepartmentGroupDepartCodes, ";");
 				}
 			}
 			String sql = String
@@ -1835,50 +1849,53 @@
 			String specializedTousseKey = "specializedTousse";
 			fromTime = dateQueryAdapter.dateAdapter(fromTime);
 			toTime = dateQueryAdapter.dateAdapter(toTime);
-			String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
-			String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
-			String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
-			String taskGroupsSql = null;
-			if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
-				taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
-			}else{
-				taskGroupsSql = "";
-			}
-			String tousseGroupIdsSql = null;
-			if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
-				tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
-			}else{
-				tousseGroupIdsSql = "";
-			}
-			String tdSql = taskGroupsSql + tousseGroupIdsSql;
 			String orgUnitCodingSql = "";
-			if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
-				if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
-					List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
-					if(CollectionUtils.isNotEmpty(departmentGroups)){
-						Set<String> departCodes = new HashSet<String>();
-						for (DepartmentGroup departmentGroup : departmentGroups) {
-							String depart = departmentGroup.getDepartCodes();
-							if(StringUtils.isNotBlank(depart)){
-								if(depart.contains(";")){
-									String[] departArr = depart.split(";");
-									for (int i = 0; i < departArr.length; i++) {
-										departCodes.add(departArr[i]);
+			String tdSql = "";
+			boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false);
+			if(!disableGroupFilterInPackingPrintRecyclingDetails){
+				String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
+				String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
+				String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
+				String taskGroupsSql = null;
+				if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
+					taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
+				}else{
+					taskGroupsSql = "";
+				}
+				String tousseGroupIdsSql = null;
+				if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
+					tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
+				}else{
+					tousseGroupIdsSql = "";
+				}
+				tdSql = taskGroupsSql + tousseGroupIdsSql;
+				if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
+					if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
+						List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
+						if(CollectionUtils.isNotEmpty(departmentGroups)){
+							Set<String> departCodes = new HashSet<String>();
+							for (DepartmentGroup departmentGroup : departmentGroups) {
+								String depart = departmentGroup.getDepartCodes();
+								if(StringUtils.isNotBlank(depart)){
+									if(depart.contains(";")){
+										String[] departArr = depart.split(";");
+										for (int i = 0; i < departArr.length; i++) {
+											departCodes.add(departArr[i]);
+										}
+									}else{
+										departCodes.add(depart);
 									}
-								}else{
-									departCodes.add(depart);
 								}
 							}
+							if(departCodes.size() > 0){
+								orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.departCode", departCodes, " 1=1 ");
+							}
 						}
-						if(departCodes.size() > 0){
-							orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.departCode", departCodes, " 1=1 ");
-						}
+					}else{
+						orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("rr.departCode", recyDepartmentGroupDepartCodes, ";");
 					}
-				}else{
-					orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("rr.departCode", recyDepartmentGroupDepartCodes, ";");
 				}
 			}
-			
 			//1.按条件查询符合条件的内容
 			String queryCondition = " and rr.orgUnitCoding='"+ handlerDepartCoding +"' "
 					+ "and rr.recyclingTime between "+ fromTime +" and "+ toTime +" "
@@ -2047,47 +2064,51 @@
 		if (StringUtils.isNotBlank(fromTime) && StringUtils.isNotBlank(toTime) && StringUtils.isNotBlank(handlerDepartCoding)) {
 			fromTime = dateQueryAdapter.dateAdapter(fromTime);
 			toTime = dateQueryAdapter.dateAdapter(toTime);
-			String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
-			String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
-			String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
-			String taskGroupsSql = null;
-			if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
-				taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
-			}else{
-				taskGroupsSql = "";
-			}
-			String tousseGroupIdsSql = null;
-			if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
-				tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
-			}else{
-				tousseGroupIdsSql = "";
-			}
-			String tdSql = taskGroupsSql + tousseGroupIdsSql;
 			String orgUnitCodingSql = "";
-			if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
-				if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
-					List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
-					if(CollectionUtils.isNotEmpty(departmentGroups)){
-						Set<String> departCodes = new HashSet<String>();
-						for (DepartmentGroup departmentGroup : departmentGroups) {
-							String depart = departmentGroup.getDepartCodes();
-							if(StringUtils.isNotBlank(depart)){
-								if(depart.contains(";")){
-									String[] departArr = depart.split(";");
-									for (int i = 0; i < departArr.length; i++) {
-										departCodes.add(departArr[i]);
+			String tdSql = "";
+			boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false);
+			if(!disableGroupFilterInPackingPrintRecyclingDetails){
+				String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
+				String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
+				String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
+				String taskGroupsSql = null;
+				if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
+					taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
+				}else{
+					taskGroupsSql = "";
+				}
+				String tousseGroupIdsSql = null;
+				if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
+					tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
+				}else{
+					tousseGroupIdsSql = "";
+				}
+				tdSql = taskGroupsSql + tousseGroupIdsSql;
+				if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
+					if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
+						List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
+						if(CollectionUtils.isNotEmpty(departmentGroups)){
+							Set<String> departCodes = new HashSet<String>();
+							for (DepartmentGroup departmentGroup : departmentGroups) {
+								String depart = departmentGroup.getDepartCodes();
+								if(StringUtils.isNotBlank(depart)){
+									if(depart.contains(";")){
+										String[] departArr = depart.split(";");
+										for (int i = 0; i < departArr.length; i++) {
+											departCodes.add(departArr[i]);
+										}
+									}else{
+										departCodes.add(depart);
 									}
-								}else{
-									departCodes.add(depart);
 								}
 							}
+							if(departCodes.size() > 0){
+								orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.departCode", departCodes, " 1=1 ");
+							}
 						}
-						if(departCodes.size() > 0){
-							orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.departCode", departCodes, " 1=1 ");
-						}
+					}else{
+						orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("rr.departCode", recyDepartmentGroupDepartCodes, ";");
 					}
-				}else{
-					orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("rr.departCode", recyDepartmentGroupDepartCodes, ";");
 				}
 			}
 			//1.按条件查询符合条件的内容
@@ -2185,53 +2206,56 @@
 		String toTime = StrutsParamUtils.getPraramValue("endDateTime", "");
 		String handlerDepartCoding = StrutsParamUtils.getPraramValue("handlerDepartCoding","");
 		if (StringUtils.isNotBlank(fromTime) && StringUtils.isNotBlank(toTime) && StringUtils.isNotBlank(handlerDepartCoding)) {
-			String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
-			String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
-			String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
-			String taskGroupsSql = null;
-			if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
-				taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
-			}else{
-				taskGroupsSql = "";
-			}
-			String tousseGroupIdsSql = null;
-			if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
-				tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
-			}else{
-				tousseGroupIdsSql = "";
-			}
-			String tdSql = taskGroupsSql + tousseGroupIdsSql;
+			String tdSql = "";
 			String departCodeSqlSql = "";
 			String departCodingSql = "";
-			if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
-				if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
-					List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
-					if(CollectionUtils.isNotEmpty(departmentGroups)){
-						Set<String> departCodes = new HashSet<String>();
-						for (DepartmentGroup departmentGroup : departmentGroups) {
-							String depart = departmentGroup.getDepartCodes();
-							if(StringUtils.isNotBlank(depart)){
-								if(depart.contains(";")){
-									String[] departArr = depart.split(";");
-									for (int i = 0; i < departArr.length; i++) {
-										departCodes.add(departArr[i]);
+			boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false);
+			if(!disableGroupFilterInPackingPrintRecyclingDetails){
+				String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
+				String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
+				String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
+				String taskGroupsSql = null;
+				if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
+					taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
+				}else{
+					taskGroupsSql = "";
+				}
+				String tousseGroupIdsSql = null;
+				if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
+					tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
+				}else{
+					tousseGroupIdsSql = "";
+				}
+				tdSql = taskGroupsSql + tousseGroupIdsSql;
+				if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
+					if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
+						List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
+						if(CollectionUtils.isNotEmpty(departmentGroups)){
+							Set<String> departCodes = new HashSet<String>();
+							for (DepartmentGroup departmentGroup : departmentGroups) {
+								String depart = departmentGroup.getDepartCodes();
+								if(StringUtils.isNotBlank(depart)){
+									if(depart.contains(";")){
+										String[] departArr = depart.split(";");
+										for (int i = 0; i < departArr.length; i++) {
+											departCodes.add(departArr[i]);
+										}
+									}else{
+										departCodes.add(depart);
 									}
-								}else{
-									departCodes.add(depart);
 								}
 							}
+							if(departCodes.size() > 0){
+								departCodeSqlSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCode", departCodes, " 1=1 ");
+								departCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCoding", departCodes, " 1=1 ");
+							}
 						}
-						if(departCodes.size() > 0){
-							departCodeSqlSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCode", departCodes, " 1=1 ");
-							departCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCoding", departCodes, " 1=1 ");
-						}
+					}else{
+						departCodeSqlSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.departCode", recyDepartmentGroupDepartCodes, ";");
+						departCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.departCoding", recyDepartmentGroupDepartCodes, ";");
 					}
-				}else{
-					departCodeSqlSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.departCode", recyDepartmentGroupDepartCodes, ";");
-					departCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.departCoding", recyDepartmentGroupDepartCodes, ";");
 				}
 			}
-			
 			fromTime = dateQueryAdapter.dateAdapter(fromTime);
 			toTime = dateQueryAdapter.dateAdapter(toTime);
 			//手术室不用统计
@@ -2401,49 +2425,53 @@
 			StrutsResponseUtils.output(JSONUtil.buildJsonObject(false, "回收清单参数配置有误！缺失tables"));
 			return;
 		}
-		String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
-		String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
-		String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
-		String taskGroupsSql = null;
-		if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
-			taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
-		}else{
-			taskGroupsSql = "";
-		}
-		String tousseGroupIdsSql = null;
-		if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
-			tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
-		}else{
-			tousseGroupIdsSql = "";
-		}
-		String recyDepartmentGroupIdsSql = "";
-		if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
-			if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
-				List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
-				if(CollectionUtils.isNotEmpty(departmentGroups)){
-					Set<String> departCodes = new HashSet<String>();
-					for (DepartmentGroup departmentGroup : departmentGroups) {
-						String depart = departmentGroup.getDepartCodes();
-						if(StringUtils.isNotBlank(depart)){
-							if(depart.contains(";")){
-								String[] departArr = depart.split(";");
-								for (int i = 0; i < departArr.length; i++) {
-									departCodes.add(departArr[i]);
+		boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false);
+		String extraSql = "";
+		if(!disableGroupFilterInPackingPrintRecyclingDetails){
+			String taskGroups = StrutsParamUtils.getPraramValue("taskGroups","");
+			String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds","");
+			String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");
+			String taskGroupsSql = null;
+			if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部")){
+				taskGroupsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.taskGroup", taskGroups, ",");
+			}else{
+				taskGroupsSql = "";
+			}
+			String tousseGroupIdsSql = null;
+			if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("-1")){
+				tousseGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseGroupID", tousseGroupIds, ",");
+			}else{
+				tousseGroupIdsSql = "";
+			}
+			String recyDepartmentGroupIdsSql = "";
+			if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){
+				if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){
+					List<DepartmentGroup> departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName());
+					if(CollectionUtils.isNotEmpty(departmentGroups)){
+						Set<String> departCodes = new HashSet<String>();
+						for (DepartmentGroup departmentGroup : departmentGroups) {
+							String depart = departmentGroup.getDepartCodes();
+							if(StringUtils.isNotBlank(depart)){
+								if(depart.contains(";")){
+									String[] departArr = depart.split(";");
+									for (int i = 0; i < departArr.length; i++) {
+										departCodes.add(departArr[i]);
+									}
+								}else{
+									departCodes.add(depart);
 								}
-							}else{
-								departCodes.add(depart);
 							}
 						}
+						if(departCodes.size() > 0){
+							recyDepartmentGroupIdsSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("ou.orgUnitCoding", departCodes, " 1=1 ");
+						}
 					}
-					if(departCodes.size() > 0){
-						recyDepartmentGroupIdsSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("ou.orgUnitCoding", departCodes, " 1=1 ");
-					}
+				}else{
+					recyDepartmentGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("ou.orgUnitCoding", recyDepartmentGroupDepartCodes, ";");
 				}
-			}else{
-				recyDepartmentGroupIdsSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("ou.orgUnitCoding", recyDepartmentGroupDepartCodes, ";");
 			}
+			extraSql = taskGroupsSql + tousseGroupIdsSql + recyDepartmentGroupIdsSql;
 		}
-		String extraSql = taskGroupsSql + tousseGroupIdsSql + recyDepartmentGroupIdsSql;
 		JSONObject resultObj = new JSONObject();
 		JSONArray tableArr = new JSONArray();
 		try {
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
===================================================================
diff -u -r33152 -r33639
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 33152)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 33639)
@@ -211,5 +211,7 @@
   //值为 "dingxiang"显示主页显示丁香的logo,不配置或者配为"forgon",显示孚峻的logo。
   companyName:"dingxiang",
   //是否启用加急功能
-  enableUrgentFunction : true
+  enableUrgentFunction : true,
+  //禁用装配打印回收明细分组
+  disableGroupFilterInPackingPrintRecyclingDetails:true
 }
\ No newline at end of file