Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java
===================================================================
diff -u -r29723 -r29724
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java	(.../PrepareRecycleTousseManagerImpl.java)	(revision 29723)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java	(.../PrepareRecycleTousseManagerImpl.java)	(revision 29724)
@@ -76,7 +76,7 @@
 							throw new BorrowUnRecturnException(msg);
 						}
 					}
-				}else if(isContinue){
+				}else if(isContinue != null && isContinue){
 					restApplyTousses = new HashMap<>();
 					tousseDefIdPrepareRecycleAmountMap = new HashMap<Long, TousseItemVo>();
 				}
@@ -91,7 +91,7 @@
 							.optInt("prepareRecycleAmount");
 					if (item != null) {
 						item.setPrepareRecycleAmount(prepareRecycleAmount);
-						if(isContinue && DatabaseUtil.isPoIdValid(item.getTousseDefinitionId())){
+						if(isContinue != null && isContinue && DatabaseUtil.isPoIdValid(item.getTousseDefinitionId())){
 							TousseDefinition td = tousseDefinitionManager.get(item.getTousseDefinitionId());
 							if(td != null){
 								setTousseAmountInfo(tousseDefIdPrepareRecycleAmountMap, restApplyTousses, td, prepareRecycleAmount);
@@ -109,13 +109,13 @@
 							if (td.isDisinfection()) {
 								recyclingApplicationManager.addDisinfectTousseItem(plan, prepareRecycleAmount,
 										td,item);
-								if(isContinue){
+								if(isContinue != null && isContinue){
 									setTousseAmountInfo(tousseDefIdPrepareRecycleAmountMap, restApplyTousses, tousseDefinitionManager.get(item.getTousseDefinitionId()), prepareRecycleAmount);
 								}
 //								continue;
 							}else{
 								item.setTousseDefinitionId(td.getId());
-								if(isContinue){
+								if(isContinue != null && isContinue){
 									setTousseAmountInfo(tousseDefIdPrepareRecycleAmountMap, restApplyTousses, td, prepareRecycleAmount);
 								}
 								item.setMaterialAmount(td.getMaterialAmount());
@@ -160,7 +160,7 @@
 					plan.setPrepareRecycleOperator(operator);
 					plan.setPrepareRecycleDateTime(new Date());
 					save(plan);
-					if(isContinue){
+					if(isContinue != null && isContinue){
 						returnTousse(tousseDefIdPrepareRecycleAmountMap, restApplyTousses, plan, plan.getDepartCoding());
 					}
 					success = true;