Index: ssts-web/src/main/webapp/disinfectsystem/goodFilterConfig/goodFilterTemplateForm.js
===================================================================
diff -u -r16820 -r16862
--- ssts-web/src/main/webapp/disinfectsystem/goodFilterConfig/goodFilterTemplateForm.js	(.../goodFilterTemplateForm.js)	(revision 16820)
+++ ssts-web/src/main/webapp/disinfectsystem/goodFilterConfig/goodFilterTemplateForm.js	(.../goodFilterTemplateForm.js)	(revision 16862)
@@ -822,6 +822,10 @@
 function validateAndSubmit() {
     //申请部门
     var deptInfo = getDeptInfo();
+    if (deptInfo.length == 0){
+        showResult('申请科室不能为空!');
+        return;
+    }
     //申请的器械包
     var tousseInfo = getTousseInfo();
     // var baseInfo = {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/BlackListHandler.java
===================================================================
diff -u -r16854 -r16862
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/BlackListHandler.java	(.../BlackListHandler.java)	(revision 16854)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/BlackListHandler.java	(.../BlackListHandler.java)	(revision 16862)
@@ -1,9 +1,11 @@
 package com.forgon.disinfectsystem.goodFilterConfig.service;
 
 import com.forgon.tools.SqlBuilder;
+import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.util.ObjectUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import java.util.List;
@@ -53,22 +55,22 @@
     @Override
     public String buildTemplate(String templateJson, List<Long> blackList) {
         JSONArray jsonArray = JSONArray.fromObject("[" + templateJson + "]");
-        logger.debug("原来模板的物品数量:" + jsonArray.size());
+        logger.debug("原来的物品数量:" + jsonArray.size());
         JSONArray result = new JSONArray();
         for (int i = 0, size = jsonArray.size(); i < size; i++) {
             JSONObject jsonObject = jsonArray.getJSONObject(i);
             Long tousseDefinitionID = jsonObject.getLong("tousseDefinitionID");
             String tousseType = jsonObject.getString("tousseType");
             //只对器械包做黑名单处理
             if ("器械包".equals(tousseType)) {
-                if (!blackList.contains(tousseDefinitionID)) {
+                if (!blackList.contains(tousseDefinitionID) || StringUtils.isNotBlank(JSONUtil.optString(jsonObject, "count", null))) {
                     result.add(jsonObject);
                 }
                 continue;
             }
             result.add(jsonObject);
         }
-        logger.debug("执行黑名单过滤后的模板物品数量:" + result.size());
+        logger.debug("执行黑名单过滤后的物品数量:" + result.size());
         return result.toString();
     }
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/WhiteListHandler.java
===================================================================
diff -u -r16854 -r16862
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/WhiteListHandler.java	(.../WhiteListHandler.java)	(revision 16854)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/WhiteListHandler.java	(.../WhiteListHandler.java)	(revision 16862)
@@ -1,9 +1,11 @@
 package com.forgon.disinfectsystem.goodFilterConfig.service;
 
 import com.forgon.tools.SqlBuilder;
+import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.util.ObjectUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import java.util.List;
@@ -54,21 +56,22 @@
     public String buildTemplate(String templateJson, List<Long> whiteList) {
         JSONArray jsonArray = JSONArray.fromObject("[" + templateJson + "]");
         JSONArray result = new JSONArray();
-        logger.debug("原来模板的物品数量:" + jsonArray.size());
+        logger.debug("原来的物品数量:" + jsonArray.size());
         for (int i = 0, size = jsonArray.size(); i < size; i++) {
             JSONObject jsonObject = jsonArray.getJSONObject(i);
             Long tousseDefinitionID = jsonObject.getLong("tousseDefinitionID");
             String tousseType = jsonObject.getString("tousseType");
             //只对器械包做白名单处理
             if ("器械包".equals(tousseType)) {
-                if (whiteList.contains(tousseDefinitionID)) {
+                //id在白名单里或者数量不为空才不过滤
+                if (whiteList.contains(tousseDefinitionID) || StringUtils.isNotBlank(JSONUtil.optString(jsonObject, "count", null))) {
                     result.add(jsonObject);
                 }
                 continue;
             }
             result.add(jsonObject);
         }
-        logger.debug("执行白名单过滤后的模板物品数量:" + result.size());
+        logger.debug("执行白名单过滤后的物品数量:" + result.size());
         return result.toString();
     }
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java
===================================================================
diff -u -r16856 -r16862
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java	(.../GoodFilterConfigManagerImpl.java)	(revision 16856)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java	(.../GoodFilterConfigManagerImpl.java)	(revision 16862)
@@ -305,6 +305,9 @@
         if (StringUtils.isNotBlank(deptInfo)) {
             List<OrgUnitTemplateItem> orgUnitTemplateItems = JSONUtil.fromJson(deptInfo, new TypeToken<List<OrgUnitTemplateItem>>() {
             });
+            if (orgUnitTemplateItems.size() == 0){
+                throw new ParameterException("申请部门不能是空!");
+            }
             goodFilterConfig.setOrgUnitTemplateItems(orgUnitTemplateItems);
         }
     }