Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r16048 -r16134
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 16048)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 16134)
@@ -925,10 +925,13 @@
 		
 		//如果物品类型不为空时
 		if (StringUtils.isNotBlank(tousseType)) {
-			if(TousseItem.DIPOSABLE_YES.equals(tousseType)){
+			if(TousseItem.DIPOSABLE_YES.equals(tousseType) || TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseType)){
 				where8 = String.format("po.id in (select invoicePlan.id from TousseItem where (isTerminated is null or isTerminated <> true) and (amount - sendOutAmount > 0) and tousseType = '%s')",TousseItem.TYPE_DIPOSABLE_GOODS);
 			}else if(TousseItem.DIPOSABLE_NO.equals(tousseType)){
 				where8 = String.format("po.id in (select invoicePlan.id from TousseItem where (isTerminated is null or isTerminated <> true) and ((po.type = '"+InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION+"' and (recyclingAmount - sendOutAmount) > 0) or (po.type <> '"+InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION+"' and (amount - sendOutAmount) > 0)) and tousseType != '%s')",TousseItem.TYPE_DIPOSABLE_GOODS);
+			}else{
+				//具体的器械包类型
+				where8 = String.format("po.id in (select invoicePlan.id from TousseItem where (isTerminated is null or isTerminated <> true) and ((po.type = '"+InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION+"' and (recyclingAmount - sendOutAmount) > 0) or (po.type <> '"+InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION+"' and (amount - sendOutAmount) > 0)) and tousseType = '%s')",tousseType);
 			}
 		}
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
===================================================================
diff -u -r16122 -r16134
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 16122)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 16134)
@@ -87,5 +87,7 @@
   //打印发货单的版本,如果为2,则表示批量打印使用分组打印方式,并有下拉菜单,目前除配置为2以外的其他值都使用以前的单科室的多单打印
   printInvoiceVersion:2,
   //灭菌完成后生物监测的结果是否为"合格"（只针对不是外来器械包）：为true时结果默认为"合格"，没配或者为false时结果默认为"无"
-  biologyResultIsQualified : true
+  biologyResultIsQualified : true,
+  //发货计划列表,物品类型过滤的数据源
+  invoicePlanListTousseTypeArray:[{name:'全部物品类型',value:''},{name:'消毒物品',value:'消毒物品'}]
 }
\ No newline at end of file
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r16061 -r16134
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16061)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16134)
@@ -2555,6 +2555,29 @@
 		
 		return applyDateMapList;
 	}
+	public JSONArray getInvoicePlanListTousseTypeArray(){
+		String tousseTypeArrayStr = CssdUtils.getSystemSetConfigByName("invoicePlanListTousseTypeArray");
+		if(StringTools.isBlank(tousseTypeArrayStr)){
+			JSONArray array = new JSONArray();
+			JSONObject json = new JSONObject();
+			json.put("name", "全部物品类型");
+			json.put("value", "");
+			array.add(json);
+			
+			json = new JSONObject();
+			json.put("name", "一次性物品");
+			json.put("value", "是");
+			array.add(json);
+			
+			json = new JSONObject();
+			json.put("name", "非一次性物品");
+			json.put("value", "否");
+			array.add(json);
+			return array;
+		}else{
+			return JSONArray.fromObject(tousseTypeArrayStr);
+		}
+	}
 	/**
 	 * 获取发货单列表的初始数据，包括日期过滤，分组
 	 * @param params
@@ -2567,6 +2590,7 @@
 				.findAllInvoiceDepartment();
 		JSONUtil.addProperty(json, "invoiceGroups", groups);
 		JSONUtil.addProperty(json, "applyDateList", getInvoiceListApplyDateList());
+		JSONUtil.addProperty(json, "tousseTypeArray", getInvoicePlanListTousseTypeArray());
 
 		return json.toString();