Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r35341 -r35599
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 35341)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 35599)
@@ -594,7 +594,9 @@
 			}
 		}
 		JSONUtil.addMessage(json, msg);
-		json.put("versionNotMatch", versionNotMatch);
+		if(json != null){
+			json.put("versionNotMatch", versionNotMatch);
+		}
 		StrutsResponseUtils.output(json);
 					
 		return null;
@@ -3897,7 +3899,7 @@
 				if(ti.getRecyclingRecordId() != null){
 					recyclingRecordId = ti.getRecyclingRecordId();
 					TousseDefinition td = ti.getTousseDefinition();
-					if(TousseDefinition.PACKAGE_TYPE_SPLIT.equals(td)){
+					if(TousseDefinition.PACKAGE_TYPE_SPLIT.equals(td.getTousseType())){
 						tdId = td.getParentID();
 					}else{
 						tdId = ti.getTousseDefinition().getId();
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
===================================================================
diff -u -r35133 -r35599
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java	(.../RecyclingContext.java)	(revision 35133)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java	(.../RecyclingContext.java)	(revision 35599)
@@ -401,7 +401,7 @@
 					Integer loadedAmount = json.optInt("loadedAmount");
 					Integer amount = tdAmountMap.get(key);
 					amount = amount == null ? 0 : amount;
-					if(amount == loadedAmount){
+					if(amount.equals(loadedAmount)){
 						JSONObject delJson = new JSONObject();
 						delJson.put("tousseDefinitionID", tousseDefinitionID);
 						delJson.put("tousseName", tousseName);