Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
===================================================================
diff -u -r12590 -r12978
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 12590)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 12978)
@@ -169,60 +169,62 @@
 
 	private void buildTousseItemsJson(List<TousseItem> tousseItems,String confirmRecycleStr) {
 		JSONArray jsonArray = new JSONArray();
-		for (TousseItem tousseItem : tousseItems) {
-			String tousseName = tousseItem.getTousseName();
-			TousseDefinition td = tousseDefinitionManager.getForeignTousseDefinitionByTousseItem(tousseItem);
-		
-			JSONObject jsonobj = new JSONObject();
-			jsonobj.put("id", tousseItem.getId());
-			jsonobj.put("tousseName", tousseName);
-			jsonobj.put("supplierName", tousseItem.getSupplierName());
-			jsonobj.put("amount", tousseItem.getAmount());
-			jsonobj.put("includeImplant", "");
-			jsonobj.put("price", td.getPrice() == null ? 0 : td.getPrice());
-			jsonobj.put("type", "tousse");
-			jsonobj.put("uiProvider", "col");
-			jsonobj.put("cls", "master-task");
-			jsonobj.put("iconCls", "task-folder");
-			JSONArray children = new JSONArray();
+		if(tousseItems != null){
+			for (TousseItem tousseItem : tousseItems) {
+				String tousseName = tousseItem.getTousseName();
+				TousseDefinition td = tousseDefinitionManager.getForeignTousseDefinitionByTousseItem(tousseItem);
 			
-			List<MaterialInstance> fmd = td.getMaterialInstances();
-			if (fmd != null) {
-				for (int i = 0; i < fmd.size(); i++) {
-					MaterialInstance mi = fmd.get(i);
-					String usedAmountOfIncludeImplantStr = "";
-					String implantAmountOfUseRecord = "";
-					//如果是植入物
-					if (mi.getIncludeImplant().equals("是")) {
-						usedAmountOfIncludeImplantStr = (mi
-								.getUsedAmountOfIncludeImplant() == null ? "0"
-								: "" + mi.getUsedAmountOfIncludeImplant());
-						
-						implantAmountOfUseRecord = (mi
-								.getImplantAmountOfUseRecord() == null ? "0"
-								: ("" + mi.getImplantAmountOfUseRecord()));
-						
-						if("true".equals(confirmRecycleStr)){
-							usedAmountOfIncludeImplantStr = implantAmountOfUseRecord;
+				JSONObject jsonobj = new JSONObject();
+				jsonobj.put("id", tousseItem.getId());
+				jsonobj.put("tousseName", tousseName);
+				jsonobj.put("supplierName", tousseItem.getSupplierName());
+				jsonobj.put("amount", tousseItem.getAmount());
+				jsonobj.put("includeImplant", "");
+				jsonobj.put("price", td.getPrice() == null ? 0 : td.getPrice());
+				jsonobj.put("type", "tousse");
+				jsonobj.put("uiProvider", "col");
+				jsonobj.put("cls", "master-task");
+				jsonobj.put("iconCls", "task-folder");
+				JSONArray children = new JSONArray();
+				
+				List<MaterialInstance> fmd = td.getMaterialInstances();
+				if (fmd != null) {
+					for (int i = 0; i < fmd.size(); i++) {
+						MaterialInstance mi = fmd.get(i);
+						String usedAmountOfIncludeImplantStr = "";
+						String implantAmountOfUseRecord = "";
+						//如果是植入物
+						if (mi.getIncludeImplant().equals("是")) {
+							usedAmountOfIncludeImplantStr = (mi
+									.getUsedAmountOfIncludeImplant() == null ? "0"
+									: "" + mi.getUsedAmountOfIncludeImplant());
+							
+							implantAmountOfUseRecord = (mi
+									.getImplantAmountOfUseRecord() == null ? "0"
+									: ("" + mi.getImplantAmountOfUseRecord()));
+							
+							if("true".equals(confirmRecycleStr)){
+								usedAmountOfIncludeImplantStr = implantAmountOfUseRecord;
+							}
 						}
+						JSONObject obj = new JSONObject();
+						obj.put("id", mi.getId());
+						obj.put("tousseName", mi.getMaterialName());
+						obj.put("includeImplant", mi.getIncludeImplant());
+						obj.put("amount", mi.getCount());
+						obj.put("usedAmountOfIncludeImplant",usedAmountOfIncludeImplantStr);
+						obj.put("implantAmountOfUseRecord",implantAmountOfUseRecord);
+						obj.put("minDismantleAmount",mi.getMinDismantleAmount());
+						obj.put("type", "material");
+						obj.put("uiProvider", "col");
+						obj.put("leaf", true);
+						obj.put("iconCls", "task");
+						children.add(obj);
 					}
-					JSONObject obj = new JSONObject();
-					obj.put("id", mi.getId());
-					obj.put("tousseName", mi.getMaterialName());
-					obj.put("includeImplant", mi.getIncludeImplant());
-					obj.put("amount", mi.getCount());
-					obj.put("usedAmountOfIncludeImplant",usedAmountOfIncludeImplantStr);
-					obj.put("implantAmountOfUseRecord",implantAmountOfUseRecord);
-					obj.put("minDismantleAmount",mi.getMinDismantleAmount());
-					obj.put("type", "material");
-					obj.put("uiProvider", "col");
-					obj.put("leaf", true);
-					obj.put("iconCls", "task");
-					children.add(obj);
 				}
+				jsonobj.put("children", children);
+				jsonArray.add(jsonobj);
 			}
-			jsonobj.put("children", children);
-			jsonArray.add(jsonobj);
 		}
 		responsePrint(jsonArray.toString());
 	}