Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r16436 -r16482
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 16436)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 16482)
@@ -80,8 +80,10 @@
 	fields: [
 	{name : 'id'},
 	{name : 'tousseDefinitionId'},
+	{name : 'oldTousseName'},
 	{name : 'tousseName'},
 	{name : 'supplierName'},
+	{name : 'oldSupplierName'},
 	{name : 'amount'},
 	{name : 'includeImplant'},
 	{name : 'price'},
@@ -373,7 +375,9 @@
 		foreignTousseInfo.push({
 			tousseItemId : n.get("id"),
 			tousseDefinitionId : n.get("tousseDefinitionId"),
+			oldTousseName : n.get("oldTousseName"),
 			tousseName : n.get("tousseName"),
+			oldSupplierName : n.get("oldSupplierName"),
 			supplierName : n.get("supplierName"),
 			amount : n.get("amount"),
 			price : n.get("price"),
@@ -661,7 +665,9 @@
 					var tousseItem = Ext4.create('foreignTousseItemModel',{
 						id : 0,
 						tousseDefinitionId : tousseDefinitionId,
+						oldTousseName: foreignTousseName,
 						tousseName: foreignTousseName,
+						oldSupplierName : suppler,
 						supplierName : suppler,
 						amount : 1,
 						includeImplant : '',
@@ -1011,6 +1017,12 @@
             }  
         }
     },{
+		dataIndex : 'oldTousseName',
+		hidden : true
+	},{
+		dataIndex : 'oldSupplierName',
+		hidden : true
+	},{
     	header: '图片',
     	width : 50,
     	align:'center',
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r16436 -r16482
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 16436)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 16482)
@@ -412,7 +412,9 @@
 		}
 		for(int i = 0;i < jsonArray.size();i++){
 			JSONObject obj = jsonArray.optJSONObject(i);
+			String oldTousseName = obj.optString("oldTousseName");
 			String tousseName = obj.optString("tousseName");
+			String oldSupplierName = obj.optString("oldSupplierName");
 			String supplierName = obj.optString("supplierName");
 			Double price = obj.optDouble("price");
 			String recyclingStatus = obj.optString("recyclingStatus");
@@ -423,8 +425,15 @@
 			if(StringUtils.isBlank(supplierName)){
 				throw new RuntimeException("外来器械包供应商不能为空！");
 			}
+			TousseDefinition tousseDefinition = null;
+			//修改过包名称或供应商
+			if(!tousseName.equals(oldTousseName) || !supplierName.equals(oldSupplierName)){
+				tousseDefinition = getForeignTousseDefinition(oldTousseName,oldSupplierName,InvoicePlan.SIGNED_FALSE,appid);
+			}
 			//当前申请单关联的包定义
-			TousseDefinition tousseDefinition = getForeignTousseDefinition(tousseName,supplierName,InvoicePlan.SIGNED_FALSE,appid);
+			if(tousseDefinition == null){
+				tousseDefinition = getForeignTousseDefinition(tousseName,supplierName,InvoicePlan.SIGNED_FALSE,appid);
+			}
 			//祖先类包定义
 			TousseDefinition ancestorTD = getForeignTousseDefinition(tousseName,supplierName,InvoicePlan.SIGNED_TRUE,null);
 			// 已存在的外来器械包明细信息(干预外来器械保存)
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
===================================================================
diff -u -r16436 -r16482
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 16436)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 16482)
@@ -139,9 +139,11 @@
 				if(td != null){
 					JSONObject jsonobj = new JSONObject();
 					jsonobj.put("id", tousseItem.getId());
+					jsonobj.put("oldTousseName", tousseName);
 					jsonobj.put("tousseName", tousseName);
 					jsonobj.put("tousseDefinitionId", td.getId());
 					jsonobj.put("supplierName", tousseItem.getSupplierName());
+					jsonobj.put("oldSupplierName", tousseItem.getSupplierName());
 					jsonobj.put("amount", tousseItem.getAmount());
 					jsonobj.put("includeImplant", "");
 					jsonobj.put("price", td.getPrice() == null ? 0 : td.getPrice());