Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r41622 -r41632
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 41622)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 41632)
@@ -4372,7 +4372,7 @@
 	}
 	@Override
 	public List<ExpressRecyclingVo> getExpressRecyclingTousseVo(Long tousseGroupId, Long departmentGroupId, String departCoding){
-		StringBuffer sql = getExpressRecyclingSql(tousseGroupId, departmentGroupId, departCoding, " order by po.tousseName asc ");
+		StringBuffer sql = getExpressRecyclingSql(tousseGroupId, departmentGroupId, departCoding, " order by po.tousseName asc ", false);
 		ResultSet rs = null;
 		List<ExpressRecyclingVo> quickRecyclingList = new ArrayList<ExpressRecyclingVo>();
 		Set<Long> ipIds = new HashSet<Long>();
@@ -4423,7 +4423,16 @@
 			objectDao.excuteSQL("update invoicePlan set readed = "+InvoicePlan.READED+" where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", ipIds));
 		}
 	}
-	private StringBuffer getExpressRecyclingSql(Long tousseGroupId, Long departmentGroupId, String departCoding, String orderBySql){
+	/**
+	 * 获取快速回收物品
+	 * @param tousseGroupId 器械包分组
+	 * @param departmentGroupId 科室分组
+	 * @param departCoding 申请科室
+	 * @param orderBySql 排序
+	 * @param filterinTerminated 过滤掉被终止的物品
+	 * @return
+	 */
+	private StringBuffer getExpressRecyclingSql(Long tousseGroupId, Long departmentGroupId, String departCoding, String orderBySql, Boolean filterinTerminated){
 		String tousseGroupIdSql = null;
 		if(DatabaseUtil.isPoIdValid(tousseGroupId)){
 			tousseGroupIdSql = " and td.tousseGroupID=" + tousseGroupId;
@@ -4471,15 +4480,18 @@
 		.append(Constants.STR_YES)
 		.append("' and (po.isThereIdentificationCard is null or po.isThereIdentificationCard='")
 		.append(Constants.STR_NO)
-		.append("') and po.recyclingAmount is null ")
-		.append(departmentGroupIdSql)
+		.append("') and po.recyclingAmount is null ");
+		if(filterinTerminated != null && filterinTerminated){
+			sql.append(" and (po.isTerminated is null or isTerminated<>1)");
+		}
+		sql.append(departmentGroupIdSql)
 		.append(orderBySql);
 		return sql;
 	}
 	@Override
 	public Map<String, Map<String, List<ExpressRecyclingVo>>> getDepartExpressRecyclingTousseVo(
 	        Long tousseGroupId, Long departmentGroupId, String departCoding) {
-	    StringBuffer sql = getExpressRecyclingSql(tousseGroupId, departmentGroupId, departCoding, " order by ip.applicationTime desc, po.tousseName asc ");
+	    StringBuffer sql = getExpressRecyclingSql(tousseGroupId, departmentGroupId, departCoding, " order by ip.applicationTime desc, po.tousseName asc ", true);
 	    ResultSet rs = null;
 	    // 第一个key是applicationTime的年月日  第二个key是tousseName 
 	    Map<String, Map<String, List<ExpressRecyclingVo>>> resultMap = new LinkedHashMap<>();