Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
===================================================================
diff -u -r29768 -r29774
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 29768)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 29774)
@@ -263,11 +263,11 @@
 				String tousseName = tousseItem.getTousseName();
 				TousseDefinition td = tousseDefinitionManager.getForeignTousseDefinitionByTousseItem(tousseItem);
 				if(td != null){
-					// 外来器械包的包实例(外来器械申请单同一个物品只申请一个)
+					// 外来器械包的包实例
 					Long invoicePlanID = tousseItem.getInvoicePlanID();
-					String condition = String.format(" (po.tousseDefinition.id = %s or po.tousseDefinition.ancestorID = %s) and po.foreignTousseApp_id = %s", 
+					String condition = String.format(" (po.tousseDefinition.id = %s or po.tousseDefinition.parentID = %s) and po.foreignTousseApp_id = %s", 
 							tousseItem.getTousseDefinitionId(), tousseItem.getTousseDefinitionId(), invoicePlanID);
-					TousseInstance ti = tousseInstanceManager.getFirst(condition);
+					List<TousseInstance> tiList = tousseInstanceManager.getByHql(condition);
 					JSONObject jsonobj = new JSONObject();
 					jsonobj.put("id", tousseItem.getId());
 					jsonobj.put("oldTousseName", tousseName);
@@ -293,9 +293,7 @@
 						jsonobj.put("urgentLevel", urgentLevelObj.getName());
 						jsonobj.put("urgentLevelId", urgentLevelObj.getId());
 					}
-					if(ti != null){
-						jsonobj.put("barcode", ti.getBarcode());
-					}
+					
 					JSONArray children = new JSONArray();
 					
 					List<MaterialInstance> fmd = td.getMaterialInstances();
@@ -334,13 +332,22 @@
 							obj.put("leaf", true);
 							obj.put("iconCls", "task");
 							obj.put("washClassifyType", materialInstanceManager.getMaterialWashClassifyType(mi,true));
-							if(i == 0 && ti != null){
+							if(i == 0){
 								//包实例的条码，放在第一个材料的位置，方便前台展示
-								obj.put("supplierName", ti.getBarcode());
-								obj.put("tdName", td.getName());
-								obj.put("isComboTousse", td.isComboTousse());
-								obj.put("tousseDefinitionId", td.getId());
-								obj.put("tousseType", td.getTousseType());
+								if(CollectionUtils.isNotEmpty(tiList)){
+									JSONArray tousseInstanceArr = new JSONArray();
+									for (TousseInstance ti : tiList) {
+										JSONObject tiJson = new JSONObject();
+										tiJson.put("supplierName", ti.getBarcode());
+										tiJson.put("tdName", ti.getTousseName());
+										tiJson.put("isComboTousse", td.isComboTousse());
+										tiJson.put("tousseDefinitionId", td.getId());
+										tiJson.put("tousseType", td.getTousseType());
+										tiJson.put("tousseInstanceId", ti.getId());
+										tousseInstanceArr.add(tiJson);
+									}
+									obj.put("tousseInstanceArr", tousseInstanceArr);
+								}
 							}
 							children.add(obj);
 						}
@@ -573,8 +580,8 @@
 	public void comfirmReturnOrEarlyReturn() {
 		String ids = StrutsParamUtils.getPraramValue("ids", "");
 		String returnType = StrutsParamUtils.getPraramValue("returnType", "");
-		String returneeOfSupplier = StrutsParamUtils.getPraramValue("returneeOfSupplier", "");
-		String returnMan = StrutsParamUtils.getPraramValue("returnMan", "");
+		String returneeOfSupplier = StrutsParamUtils.getPraramValue("returneeOfSupplier1", "");
+		String returnMan = StrutsParamUtils.getPraramValue("returnMan1", "");
 		if (StringTools.isNotBlank(ids)) {
 			JSONObject result = JSONUtil.buildJsonObject(true, String.format("%s成功！", returnType));
 			try {