Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r17212 -r17336
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 17212)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 17336)
@@ -2820,7 +2820,8 @@
 					}
 					tousseItem.setTousseDefinitionId(td.getId());
 					tousseItem.setIsInvoice(td.getIsInvoice());
-					tousseItem.setIsRecycling(td.getIsRecycling());
+					String isRecycling = td.getIsRecycling();
+					tousseItem.setIsRecycling(isRecycling);
 					tousseItem.setIsApplyEntireTousse(td.getIsApplyEntireTousse());
 					tousseItem.setIsCleanedEntirely(td.getIsCleanedEntirely());
 					tousseItem.setExpressRecycling(td.getExpressRecycling());
@@ -2845,12 +2846,19 @@
 									.equals(td.getIsRecycling())) {
 						includeRecyclingItems = InvoicePlan.SIGNED_TRUE;
 					}
-					if (TousseDefinition.PACKAGE_TYPE_DRESSING
-							.equals(td.getTousseType())) {
+					// if (TousseDefinition.PACKAGE_TYPE_DRESSING
+					// 		.equals(td.getTousseType())) {
+					// 	includeInvoiceItems = InvoicePlan.SIGNED_TRUE;
+					// }
+					//(不回收,或者回收状态是空)且没有被终止includeInvoiceItems的值设为1
+					if ((isRecycling == null || com.forgon.Constants.STR_NO.equals(isRecycling)) && BooleanUtils.isFalse(tousseItem.terminated())){
 						includeInvoiceItems = InvoicePlan.SIGNED_TRUE;
 					}
 				} else {
-					includeInvoiceItems = InvoicePlan.SIGNED_TRUE;
+					//没有被终止includeInvoiceItems的值设为1
+					if (BooleanUtils.isFalse(tousseItem.terminated())){
+						includeInvoiceItems = InvoicePlan.SIGNED_TRUE;
+					}
 					tousseItem.setExpressRecycling(TousseDefinition.STR_NO);
 					// JSONObject goodsNameAndSp = CssdUtils.getGoodsNameAndSp(tousseItem.getTousseName());
 					// String diposableName = goodsNameAndSp.optString("materialName");