Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
===================================================================
diff -u -r19774 -r19820
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js	(.../containerForm.js)	(revision 19774)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js	(.../containerForm.js)	(revision 19820)
@@ -94,7 +94,7 @@
 				columnWidth : 0.5,
 				layout : 'form',
 				labelWidth : 80,
-				items : [  {
+				items : [{
 					xtype : 'combo',
 					fieldLabel : '类型',
 					id : 'containerType',
Index: forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
===================================================================
diff -u -r19703 -r19820
--- forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java	(.../BasePoManagerImpl.java)	(revision 19703)
+++ forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java	(.../BasePoManagerImpl.java)	(revision 19820)
@@ -135,13 +135,19 @@
 	
 	@Override
 	public T getForUpdate(Long id) {
-		T o = (T)objectDao.getByID_ForUpdate(poName, id);
-		return o;
+		if(DatabaseUtil.isPoIdValid(id)){
+			T o = (T)objectDao.getByID_ForUpdate(poName, id);
+			return o;
+		}
+		return null;
 	}
 	@Override
 	public T getForUpdate(String id) {
-		T o = (T)objectDao.getByID_ForUpdate(poName, id);
-		return o;
+		if(DatabaseUtil.isPoIdValid(id)){
+			T o = (T)objectDao.getByID_ForUpdate(poName, id);
+			return o;
+		}
+		return null;
 	}
 	
 	@Override
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
===================================================================
diff -u -r19799 -r19820
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 19799)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 19820)
@@ -22,7 +22,10 @@
  * @author WangYi
  */
 public interface TousseDefinitionManager extends BasePoManager<TousseDefinition>  {
-
+	/**
+	 * 保存或者更新器械包定义.
+	 * @param tousseDefinition
+	 */
 	public void saveOrUpdate(TousseDefinition tousseDefinition);
 
 	/**
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r19799 -r19820
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 19799)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 19820)
@@ -705,7 +705,7 @@
 	/**
 	 * 根据回收的篮筐与器械包等生成清洗篮筐实例与清洗物品明细数据
 	 * @param tousseJson 回收的清洗篮筐及器械、标识牌信息,格式:[{amount:1,basketBarcode:'',idCardBarcode:'',tousseDefinitionID:23,tousseName:''},{amount:1,basketBarcode:'',idCardBarcode:'',tousseDefinitionID:23,tousseName:''}]
-	 * @param tousseDefinition 器械包定义map
+	 * @param tousseDefinition 器械包定义
 	 * @param record 回收记录
 	 * @param containerMap 清洗篮筐map
 	 * @param isSecondRecycleForForeignTousse 是否外来器械申请单二次回收
@@ -2539,13 +2539,13 @@
 		return isOperatingRoom;
 	}
 
-	private TousseItem newApplicationItem(List<TousseDefinition> idToTDMap,
+	private TousseItem newApplicationItem(List<TousseDefinition> tousseDefinitions,
 			InvoicePlan application, String tousseName,Long tousseDefinitionID,
 			Integer recyclingAmount) {
 		TousseItem appItem;
 		appItem = new TousseItem();
 		appItem.setTousseName(tousseName);
-		TousseDefinition td = getTousseDefinition(idToTDMap, tousseDefinitionID);
+		TousseDefinition td = getTousseDefinition(tousseDefinitions, tousseDefinitionID);
 		appItem.setAmount(0);
 		appItem.setDiposable("否");
 		appItem.setSendOutAmount(0);