Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r17512 -r17609
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 17512)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 17609)
@@ -2019,7 +2019,8 @@
 					continue;
 				}
 			}
-			if ("否".equals(isRecycling) && "是".equals(isInvoice) && amount - sendOutAmount == 0){
+			//一次性物品isRecycling是为null,敷料包isRecycling是否
+			if (("否".equals(isRecycling) || isRecycling == null) && "是".equals(isInvoice) && amount - sendOutAmount == 0){
 				result.add(tousseItem.getTousseName());
 				continue;
 			}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r17282 -r17609
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 17282)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 17609)
@@ -196,7 +196,7 @@
 	 * <dl>
 	 *     <dt>3. isInvoice==是</dt>
 	 *     <dd>3.1 isRecycling==是 && recyclingAmount>0 && recyclingAmount-sendOutAmount=0</dd>
-	 *     <dd>3.2 isRecycling==否 && amount-sendOutAmount=0</dd>
+	 *     <dd>3.2 (isRecycling==否 || isRecycling==null) && amount-sendOutAmount=0(一次性物品isRecycling是为null,敷料包isRecycling是否)</dd>
 	 * </dl>
 	 * <dl>
 	 *     <dt>4. isInvoice==否</dt>
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r17530 -r17609
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 17530)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 17609)
@@ -40,7 +40,6 @@
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
-import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.json.JsonPropertyFilter;
 import com.forgon.tools.string.StringTools;
 import com.google.common.reflect.TypeToken;
@@ -54,7 +53,6 @@
 import net.sf.json.util.CycleDetectionStrategy;
 import net.sf.json.util.PropertyFilter;
 
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.collections4.Transformer;
@@ -958,7 +956,7 @@
 			if (InvoicePlan.TYPE_COMBO_FORM.equals(applicationFormType) || InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION.equals(applicationFormType)) {
 				
 				if ( TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseItem.getTousseType())){
-					JSONObject json = this.getDiposableGoodMsg(tousseItem,diposableFloatPercent);
+					JSONObject json = this.getDisposableGoodMsg(tousseItem,diposableFloatPercent);
 					// 设置是否已经终止的状态的checkbox
 					boolean isTerminated = BooleanUtils.isTrue(tousseItem.getIsTerminated());
 					json.put("isTerminated", isTerminated);
@@ -998,7 +996,7 @@
 					
 					rightStoreJson.append(json.toString());
 				} else {
-					JSONObject json = this.getDiposableGoodMsg(tousseItem,diposableFloatPercent);
+					JSONObject json = this.getDisposableGoodMsg(tousseItem,diposableFloatPercent);
 					appendJsonString(rightStoreJson, json.toString());
 				}
 			}
@@ -1035,16 +1033,30 @@
 	 * @param diposableFloatPercent 浮动价格
 	 * @return json格式的一次性物品
 	 */
-	private JSONObject getDiposableGoodMsg(TousseItem tousseItem,double diposableFloatPercent){
+	private JSONObject getDisposableGoodMsg(TousseItem tousseItem, double diposableFloatPercent){
 		Long itemId = tousseItem.getId();
 		Integer itemAmount = tousseItem.getAmount();
 		DisposableGoods disposableGoods = diposableGoodsManager.getDisposableGoodsById(tousseItem.getDisposableGoodsId());
 		JSONObject json = departmentAppTemplateManager.diposableItem2Json(itemId.toString(), itemAmount, disposableGoods, diposableFloatPercent);
 		this.resetUnitAndCountAndRowPrice(tousseItem,json);
+		this.setTerminatedAndChecked(tousseItem, json);
 		return json;
 	}
 
 	/**
+	 * 设置终止状态和已选状态, 返回页面使用,如果该物品是已经终止了的,则会有isTerminated和checked,页面上该行会被选中并且变成红色
+	 * @param tousseItem 该申请物品
+	 * @param json 返回页面的json格式数据
+	 */
+	private void setTerminatedAndChecked(TousseItem tousseItem, JSONObject json){
+		if(tousseItem != null){
+			boolean isTerminated = BooleanUtils.isTrue(tousseItem.getIsTerminated());
+			json.put("isTerminated", isTerminated);
+			json.put("checked", isTerminated);
+		}
+	}
+
+	/**
 	 * 重新设置单位和数量和总价
 	 * @param tousseItem
 	 * @param json