Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r19453 -r19470
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 19453)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 19470)
@@ -1357,16 +1357,7 @@
 			}
 			obj.put("totalCount", data.size());
 			obj.put("data", data);
-			HttpServletResponse response = StrutsParamUtils.getResponse();
-			response.setCharacterEncoding("UTF-8");
-			PrintWriter out;
-			try {
-				out = response.getWriter();
-				out.print(obj);
-				out.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+			StrutsResponseUtils.output(obj);
 
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r19036 -r19470
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 19036)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 19470)
@@ -460,6 +460,9 @@
 					String usedAmountOfIncludeImplant = materialJson.optString("usedAmountOfIncludeImplant");
 					String minDismantleAmount = materialJson.optString("minDismantleAmount");
 					MaterialInstance materialInstance = null;// 包的材料
+					if(amount == 0){
+						continue;//过滤掉数量为0的材料
+					}
 					if (StringUtils.isBlank(materialInstanceId)) {
 						materialInstance = new MaterialInstance();
 					} else {
@@ -643,6 +646,12 @@
 			if (Constants.STR_YES.equals(includeImplant)) {
 				includeImplantFlag = TousseDefinition.INCLUDE_IMPLANT;
 			}
+			if(DatabaseUtil.isPoIdValid(appid)){
+				//关联申请单的外来器械包定义,材料数量不能为0
+				if(amount <= 0){
+					continue;
+				}
+			}
 			String minDismantleAmount = materialJson.optString("minDismantleAmount");
 			MaterialInstance mi = new MaterialInstance();
 			mi.setMaterialName(materialName);