Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r41054 -r41396
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 41054)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 41396)
@@ -1788,34 +1788,7 @@
 			String settleAccountsDepartCoding, String handleDepartCode,
 			String specifyDisposableTypes, boolean useAssetsBelong, String tousseType, String tousseDefinitionBelongDepartCode, String appCodeForBlacklistWhitelist) {
 		
-
-		String appIsUseBwList = CssdUtils.getSystemSetConfigByName("appIsUseBwList");
-		String blacklistWhiteSql = "";
-		appIsUseBwList = "true";
-		if (StringUtils.isNotBlank(appIsUseBwList) && "true".equals(appIsUseBwList)){
-			// 根据申请科室编码查找黑白名单并根据黑白名单过滤物品(ZJJSRM-2)
-			if (StringUtils.isNotBlank(appCodeForBlacklistWhitelist)){
-				List<Long> whiteList = goodFilterConfigManagerImpl.findFilterGoodByType(ListType.WHITE, appCodeForBlacklistWhitelist);
-		        List<Long> blackList = goodFilterConfigManagerImpl.findFilterGoodByType(ListType.BLACK, appCodeForBlacklistWhitelist);
-		        if (CollectionUtils.isNotEmpty(whiteList)) {
-		            if (CollectionUtils.isNotEmpty(blackList)) {
-		                //如果黑白名单不为空,则用白名单减去黑名单
-		                whiteList = (List<Long>) CollectionUtils.subtract(whiteList, blackList);
-		            }
-		            if (whiteList.size() == 0) {
-		            	//如果白名单减黑名单等于0,则用黑名单过滤
-		            	blacklistWhiteSql = SqlUtils.getNonStringFieldNotInSql("po.id", blackList);
-		            }else{
-		            	//使用白名单减去黑名单后的名单过滤
-		            	blacklistWhiteSql = SqlUtils.getInLongListSql("po.id", whiteList);
-		            }
-		        }else if(CollectionUtils.isNotEmpty(blackList)){//如果只有黑名单,则用黑名单过滤
-		        	//如果白名单减黑名单等于0,则用黑名单过滤
-	            	blacklistWhiteSql = SqlUtils.getNonStringFieldNotInSql("po.id", blackList);
-		        }
-			}
-		}
-		// 有些输入法会输入"'"，要过滤掉，不过滤执行sql会报异常
+			// 有些输入法会输入"'"，要过滤掉，不过滤执行sql会报异常
 			if(StringUtils.isNotBlank(simpleSpell)){
 				simpleSpell = simpleSpell.replace("'", "");
 			}
@@ -1828,9 +1801,34 @@
 					sql += " and po.handlerDepartCode = '" + handlerDepartCode + "' ";
 				}
 			}*/
-			sql += blacklistWhiteSql;
 			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 			if (isSeachTousse) {
+				String appIsUseBwList = CssdUtils.getSystemSetConfigByName("appIsUseBwList");
+				String blacklistWhiteSql = "";
+				if (StringUtils.isNotBlank(appIsUseBwList) && "true".equals(appIsUseBwList)){
+					// 根据申请科室编码查找黑白名单并根据黑白名单过滤物品(ZJJSRM-2)
+					if (StringUtils.isNotBlank(appCodeForBlacklistWhitelist)){
+						List<Long> whiteList = goodFilterConfigManagerImpl.findFilterGoodByType(ListType.WHITE, appCodeForBlacklistWhitelist);
+				        List<Long> blackList = goodFilterConfigManagerImpl.findFilterGoodByType(ListType.BLACK, appCodeForBlacklistWhitelist);
+				        if (CollectionUtils.isNotEmpty(whiteList)) {
+				            if (CollectionUtils.isNotEmpty(blackList)) {
+				                //如果黑白名单不为空,则用白名单减去黑名单
+				                whiteList = (List<Long>) CollectionUtils.subtract(whiteList, blackList);
+				            }
+				            if (whiteList.size() == 0) {
+				            	//如果白名单减黑名单等于0,则用黑名单过滤
+				            	blacklistWhiteSql = SqlUtils.getNonStringFieldNotInSql("po.id", blackList);
+				            }else{
+				            	//使用白名单减去黑名单后的名单过滤
+				            	blacklistWhiteSql = SqlUtils.getInLongListSql("po.id", whiteList);
+				            }
+				        }else if(CollectionUtils.isNotEmpty(blackList)){//如果只有黑名单,则用黑名单过滤
+				        	//如果白名单减黑名单等于0,则用黑名单过滤
+			            	blacklistWhiteSql = SqlUtils.getNonStringFieldNotInSql("po.id", blackList);
+				        }
+					}
+				}
+				sql += blacklistWhiteSql;
 				if (onlySearchRecyclingTousse){
 					sql += " and po.isRecycling = '"+TousseDefinition.STR_YES+"' and po.tousseType in ('"+ TousseDefinition.PACKAGE_TYPE_INSIDE +"','"+ TousseDefinition.PACKAGE_TYPE_DISINFECTION +"') ";
 				}