Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r13017 -r13654
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 13017)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 13654)
@@ -306,6 +306,11 @@
 		return vo;
 	}
 
+	/**
+	 * 根据申请单id查询申请单信息(并列出所有申请物品)
+	 * @param id 申请单id
+	 * @return
+	 */
 	public String getRecyclingApplicationAndVerifyEdit(String id) {
 		String json = "";
 		JsonConfig config = new JsonConfig();
@@ -864,6 +869,7 @@
 				+ " AND po.isPrinted = false"
 				+ " AND po.invoicePlan.recyclingStatus = :recyclingStatus"
 				+ " AND po.invoicePlan.departCoding = :departCoding"
+				+ " AND (po.isTerminated is null or po.isTerminated <> true)"
 				+ " AND po.invoicePlan.type IN (:invoicePlanType) order by id asc";
 		Query query = objectDao.getHibernateSession().createQuery(sql);
 		query.setParameterList("tousseTypes", tousseTypes);
@@ -881,8 +887,12 @@
 		return items;
 	}
 	
-	// 批量打印申请单，id为打印批次的id，根据此id可以找到属于该批次的科室名单
-	// 返回打印内容的JSON字符串
+	/**
+	 * 批量打印申请单，id为打印批次的id，根据此id可以找到属于该批次的科室名单(只打印未终止的申请物品)
+	 * 返回打印内容的JSON字符串
+	 * @param jsonParams
+	 * @return
+	 */
 	public String findPrintRecyclingGoods(String jsonParams) {
 		JSONObject jsonObject = null;
 		String shiftName = "";
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r13583 -r13654
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13583)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13654)
@@ -1445,7 +1445,7 @@
 	}
 	
 	/**
-	 * 根据选择的申请单的ID进行打印
+	 * 根据选择的申请单的ID进行打印(只打印未终止的物品)
 	 * applicationIds的id必须是同一科室的申请单ID，否则会把不同科室的单的内容打印在一起
 	 * @param printScope   页面传入的打印参数
 	 * @param applicationIds  要打印的申请单ID的集合
@@ -1467,7 +1467,7 @@
 		}
 	}
 	
-	// 选择多张申请单进行批量打印
+	// 选择多张申请单进行批量打印(只打印未终止的物品)
 	public void getPrintObjectByApplicationIds(JSONObject printScope,
 			String applicationIds, String printUser, List<PrintSummaryVo> summaryList) {
 		
@@ -2603,6 +2603,7 @@
 				+ " WHERE po.tousseType in (:tousseTypes)"
 				+ " AND po.invoicePlan.committedStatus = 1"
 				+ " AND po.isPrinted = false"
+				+ " AND (po.isTerminated is null or po.isTerminated <> true)"
 				+ " AND (po.invoicePlan.recyclingStatus != :recyclingStatus OR po.invoicePlan.recyclingStatus is null)"
 				+ " AND po.invoicePlan.deliverStatus IN (:deliverStatus)"
 				+ " AND po.invoicePlan.departCoding = :departCoding"
@@ -2650,7 +2651,7 @@
 		fromTime = dateQueryAdapter.dateAdapter(fromTime);
 		toTime = dateQueryAdapter.dateAdapter(toTime);
 		
-		String sql = String.format(" where po.tousseType = '%s'"
+		String sql = String.format(" where po.tousseType = '%s' and (po.isTerminated is null or po.isTerminated <> true)"
 				+ " and po.recyclingRecord.recyclingTime between %s and %s and po.recyclingRecord.orgUnitCoding = '%s'", tousseType,
 				fromTime, toTime, handlerDepartCoding);