Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r21236 -r21252
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 21236)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 21252)
@@ -154,8 +154,13 @@
 	} 
 }
 
+/**
+ * 增加物品（即点击左边的“+”图标）.
+ * @param row
+ */
 function add(row){
 	var recycleAmount = $('#recycleAmount'+row).val() == ''?0:parseInt($('#recycleAmount'+row).val(),10);
+	//是否整包申请
 	var isApplyEntireTousse = $('#isApplyEntireTousse'+row).val();
 	var tousseType = $('#tousseType'+row).val();
 	if(recycleAmount >= 1){
@@ -172,6 +177,10 @@
 	setTousseItemLoadedAmountCss(row);
 }
 
+/**
+ * 减少物品（即点击左边的“-”图标）.
+ * @param row
+ */
 function reduce(row){
     var recycleAmount = $('#recycleAmount'+row).val() == ''?0:parseInt($('#recycleAmount'+row).val(),10)-1;
     if(recycleAmount >= 0){
@@ -291,6 +300,15 @@
     }
 }
 
+/**
+ * 删除物品.
+ * @param confirmMsg
+ * @param actionFunction
+ * @param row
+ * @param deleteButton
+ * @param basketBarcode
+ * @param basketId
+ */
 function deleteConfirm(confirmMsg,actionFunction,row,deleteButton,basketBarcode,basketId){
 	$("#dialogConfirm").dialog({
 	      resizable: false,
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r21247 -r21252
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 21247)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 21252)
@@ -331,6 +331,10 @@
 					}
 				} else {
 					TousseItemVo tousseItemVo = tousseDefIdTousseItemVoMap.get(tousseDefinitionID);
+					//如果消毒物品需要用祖先包定义的id去匹配
+					if (tousseItemVo == null) {
+						tousseItemVo = tousseDefIdTousseItemVoMap.get(td.getAncestorID());
+					}
 					if (tousseItemVo != null) {
 						//回收时扫描的器械包实例条码或者标识牌实例条码的集合（用分号分隔）
 						String tousseOrIDCardInstanceBarcodes = tousseItemVo.getTousseOrIDCardInstanceBarcodes();