Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r23986 -r23994
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 23986)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 23994)
@@ -1958,7 +1958,7 @@
 		boolean success = true;
 		String message = null;
 		
-		if (printRowVos.size() == 0){
+		if (printRowVos.size() == 0 && CollectionUtils.isEmpty(printTousseVos)){
 			success = false;
 			message = "该时间段内没有需要打印的内容！";
 		}
@@ -3851,8 +3851,12 @@
 				isNeedToBeMerged = true;
 			}
 			
+			
 			isNeedToBeMerged = isApplicationFormMerge(recyclingApplication,supplyRoomConfig, autoMerge);
+			//simon-add:判断申请物品的器械包定义是否改变，如果已改变，那么不合并
 			
+			
+			
 			if (isNeedToBeMerged) {
 				existApplication = getSameStatusRecyclingApplicationForUpdate(recyclingApplication,isCommit);
 				if (existApplication != null) {
@@ -3910,7 +3914,7 @@
 								if(oldItem.getTousseType().equals(TousseDefinition.PACKAGE_TYPE_DISINFECTION)){
 									String isApplyEntireTousse=oldItem.getIsApplyEntireTousse();
 									//如果是整包申请,包数量相加,材料数量不相加；如果非整包申请，包数量不相加，材料数量相加
-									if(isApplyEntireTousse!=null&&isApplyEntireTousse=="是"){
+									if(isApplyEntireTousse != null&&isApplyEntireTousse.equals(com.forgon.Constants.STR_YES)){
 										oldItem.setEditAmount(oldItem.getAmount() + newItem.getEditAmount());
 									}else{
 										TousseDefinition td_old = tousseDefinitionManager.getTousseDefinitionByTousseItem(oldItem);