Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r12596 -r12603
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 12596)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 12603)
@@ -179,7 +179,6 @@
 	private Long tousseGroupID;	// 器械包分组id
 	private String tousseGroupName;// 器械包分组名字
 	
-	private Long recyclingApplicationID;
 	
 	/**
 	 * 是否特殊器械包(是否或,为空默认为否),中大六院项目新增的字段,其它医院暂时不用
@@ -196,6 +195,10 @@
 	 */
 	private String isPrintMaterialForPacking;
 	
+	private Long recyclingApplicationID;// 回收申请单ID
+	
+	private Long invoicePlanID;// 申请单ID
+	
 	private Long parentID;// 父包定义ID
 	private Long ancestorID;// 祖先包定义ID
 	@Id
@@ -749,7 +752,15 @@
 	public void setTousseGroupName(String tousseGroupName) {
 		this.tousseGroupName = tousseGroupName;
 	}
+	
+	public Long getInvoicePlanID() {
+		return invoicePlanID;
+	}
 
+	public void setInvoicePlanID(Long invoicePlanID) {
+		this.invoicePlanID = invoicePlanID;
+	}
+
 	public Long getRecyclingApplicationID() {
 		return recyclingApplicationID;
 	}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r12590 -r12603
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 12590)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 12603)
@@ -417,7 +417,7 @@
 		} else {// 新的外来器械包信息
 			tousseDefinition = new TousseDefinition();
 			tousseDefinition.setName(tousseName);
-			tousseDefinition.setRecyclingApplicationID(appid);
+			tousseDefinition.setInvoicePlanID(appid);
 			tousseDefinition.setForDisplay(false);
 			//TODO:工作量统计方式，需要增加全局变量设置默认值
 			tousseDefinition
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
===================================================================
diff -u -r12590 -r12603
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java	(.../CustomRecyclingApplicationAction.java)	(revision 12590)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java	(.../CustomRecyclingApplicationAction.java)	(revision 12603)
@@ -139,7 +139,7 @@
 		} 
 		
 		tousseDefinition.setName(tousseName);
-		tousseDefinition.setRecyclingApplicationID(appid);
+		tousseDefinition.setInvoicePlanID(appid);
 		tousseDefinition.setSpelling(GB2Alpha.string2Alpha(name));
 		tousseDefinition.setWbCode(GB2WB.getWBCode(name));
 		tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_CUSTOM);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r12596 -r12603
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 12596)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 12603)
@@ -636,7 +636,7 @@
 				}
 				if (td == null) {
 					td = new TousseDefinition();
-					td.setRecyclingApplicationID(appid);
+					td.setInvoicePlanID(appid);
 				}
 				td.setHandlerDepartCode(btd.getHandlerDepartCode());
 				td.setHandlerDepartName(btd.getHandlerDepartName());
@@ -2951,6 +2951,8 @@
 			}
 		}
 		
+		
+
 		// 保存器械包申请单
 		returnMsg = saveRecyclingApplication(
 				application, tousseMap, newItemsList, oldItemsList,disinfectItemMap);
@@ -3596,7 +3598,7 @@
 				TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByNameTypeAndAPPID(t_definition_name, TousseDefinition.PACKAGE_TYPE_DISINFECTION, appid.toString());		
 				if (td == null) {
 					td = new TousseDefinition();
-					td.setRecyclingApplicationID(appid);
+					td.setInvoicePlanID(appid);
 				}
 				if(StringUtils.isNotBlank(t_tousseItem_id)){
 					td.setParentID(Long.valueOf(t_tousseItem_id));// 父亲id，页面选择的那个包定义
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r12590 -r12603
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 12590)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 12603)
@@ -2076,7 +2076,7 @@
 				// 外来器械包（未拆分成多个包）
 				if (TousseDefinition.PACKAGE_TYPE_FOREIGN
 						.equals(tousseType)) {
-					Long foreignTousseApplicationID = td.getRecyclingApplicationID();
+					Long foreignTousseApplicationID = td.getInvoicePlanID();
 					foreignTousseApplication = (ForeignTousseApplication) objectDao.getByProperty(
 							ForeignTousseApplication.class.getSimpleName(), "id",foreignTousseApplicationID);
 				}