Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r13425 -r13439
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 13425)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 13439)
@@ -283,11 +283,13 @@
 		LoginUserData userData = AcegiHelper.getLoginUser();
 		String currentOrgUnitCode = userData
 				.getCurrentOrgUnitCode();
-		if (currentOrgUnitCode != null) {
+		
+		//不再需要此条件了,因为不管是一级供应室还是二级供应室都不按包定义的处理科室条件查询
+		/*if (currentOrgUnitCode != null) {
 			if (!currentOrgUnitCode.equals(unitCodeOfFirstSupplyRoom)) {// 如果当前登录用户是一级供应室的人
 				sqlBuilder.append(String.format(" AND po.tousseDefinition.handlerDepartCode='%s'", currentOrgUnitCode));
 			}
-		}
+		}*/
 
 		String sql = sqlBuilder.toString();
 		if(StringUtils.isNotBlank(orderStr)){
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r13428 -r13439
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13428)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13439)
@@ -3596,10 +3596,10 @@
 						TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName(tousseName);
 						if(td != null && StringUtils.isNotBlank(td.getHandlerDepartCode())){
 							list.clear();
-							CssdHandleTousses cssdHandleTousses = new CssdHandleTousses();
-							cssdHandleTousses.setOrgUnitCode(td.getHandlerDepartCode());
-							cssdHandleTousses.setOrgUnitName(td.getHandlerDepartName());
-							list.add(cssdHandleTousses);
+							handleTousses = new CssdHandleTousses();
+							handleTousses.setOrgUnitCode(td.getHandlerDepartCode());
+							handleTousses.setOrgUnitName(td.getHandlerDepartName());
+							list.add(handleTousses);
 						}else{
 							handleTousses = list.get(0);
 						}