Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r30680 -r30749
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 30680)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 30749)
@@ -707,16 +707,17 @@
 					 "from tousseInstance i,tousseDefinition d,cssdHandleTousses t where i.toussedefinition_id = d.id and d.id=t.tousseDefinitionId "
 					 + "and i.comboTousseInstanceId is null and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startDateTime, fmt)+" and "
 					 + dateQueryAdapter.dateConverAdapter2(endDateTime, fmt)
-					 + " and t.taskGroup = '"
-					 + taskGroup
-					 + "' and t.orgUnitCode = '"
+					 + " and t.orgUnitCode = '"
 					 + orgUnitCode
 					 + "' and i.orgUnitCoding = '"
 					 + orgUnitCode
 				+ "'";
+		if(StringUtils.isNotBlank(taskGroup)){
+			sql += " and t.taskGroup = '"  + taskGroup + "' ";
+		}
 		//外来器械包默认处理科室及任务组
 		JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = supplyRoomConfig.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(orgUnitCode);
-		if(foreignTousseHandleDepartAndTaskGroupJsonobject != null && StringUtils.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup"))){
+		if(foreignTousseHandleDepartAndTaskGroupJsonobject != null && (StringUtils.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup")) || StringUtils.isBlank(taskGroup))){
 			//外来器械包、外来器械拆分小包
 			sql += " union all select d.name,i.reviewer as reviewer,d.isTraceable amount " +
 				 "from tousseInstance i,tousseDefinition d where i.toussedefinition_id = d.id and d.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"') "
@@ -727,7 +728,7 @@
 			+ "' ";
 		}
 		
-		if(StringUtils.equals(taskGroup, supplyRoomConfig.getCustomTousseDefaultTaskGroup())){
+		if(StringUtils.equals(taskGroup, supplyRoomConfig.getCustomTousseDefaultTaskGroup()) || StringUtils.isBlank(taskGroup)){
 			//自定义器械包
 			sql += " union all select d.name,i.reviewer as reviewer,d.isTraceable amount " +
 					 "from tousseInstance i,tousseDefinition d where i.toussedefinition_id = d.id and d.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') "