Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r29174 -r29180
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 29174)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 29180)
@@ -7863,16 +7863,16 @@
 		return allNeedToPrintDept;
 	}
 	/**
-	 * 根据类型和科室编码获取申请项
-	 * @param tousseTypes
-	 * @param departCode
+	 * 根据器械包类型和科室编码获取申请项
+	 * @param tousseTypes 器械包类型
+	 * @param departCode 科室编码
 	 * @return
 	 */
 	private List<TousseItem> getTousseItems(List<String> tousseTypes, String departCode) {
 		// 按照申请物品的先后顺序排序
 		String tousseTypeSql = SqlUtils.getStringFieldInLargeCollectionsPredicate("po.tousseType", tousseTypes);
 		String invoicePlanTypeSql = SqlUtils.getStringFieldInLargeCollectionsPredicate("po.invoicePlan.type", Arrays.asList(
-				InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM));
+				InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,InvoicePlan.TYPE_COMBO_FORM,InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM,InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM));
 		String condition = String.format("%s"
 				+ " AND po.invoicePlan.committedStatus = 1 AND po.isPrinted = false AND po.invoicePlan.recyclingStatus = '%s'"
 				+ " AND po.invoicePlan.departCoding = '%s' AND po.invoicePlan.handleDepartCoding = '%s'"