Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r30198 -r30273
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 30198)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 30273)
@@ -5380,10 +5380,12 @@
 			
 			if(isNeedToBeMerged){
 				existApplication = getSameStatusRecyclingApplicationForUpdate(recyclingApplication,isCommit);
-				//2.已打印或者已发货、部分发货的申请单不合并。
+				//2.已打印或者已发货、部分发货、终止状态为【部分终止】或者【已终止】的申请单不合并。
 				if (existApplication != null && InvoicePlan.PRINT_STATUS_PRINTED != existApplication.getPrinted()
 						&& !InvoicePlan.DELIVERSTATUS_DELIVERED.equals(existApplication.getDeliverStatus())
-						&& !InvoicePlan.DELIVERSTATUS_PARTDELIVERED.equals(existApplication.getDeliverStatus())) {
+						&& !InvoicePlan.DELIVERSTATUS_PARTDELIVERED.equals(existApplication.getDeliverStatus())
+						&& !StringUtils.equals(InvoicePlan.STATUS_PART_END, existApplication.getEndStatus())
+						&& !StringUtils.equals(InvoicePlan.STATUS_END, existApplication.getEndStatus())) {
 					//3.再根据科室供应室的配置进行判断该项目、该申请科室是否启用或符合合并条件来决定该单是否需要合并(因为这个判断需要对比查询科室供应室的数据出来进行比较所以效率高、所以放在第二步)
 					isNeedToBeMerged = isApplicationFormMerge(recyclingApplication, existApplication, supplyRoomConfig, autoMerge);
 				} else {