Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r18671 -r18798
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 18671)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 18798)
@@ -937,6 +937,42 @@
 		return sql;
 	}
 	
+	@Override
+	public Set<String> buildTousseTypeSet(String tousseType) {
+		Set<String> tousseTypeSet = new HashSet<String>();
+		if (StringUtils.isNotBlank(tousseType)) {
+			String[] tousseTypesArray = tousseType.split(",");
+			for (String type : tousseTypesArray) {
+				switch (type) {
+				case "一次性物品":
+					tousseTypeSet.add(TousseItem.TYPE_DIPOSABLE_GOODS);
+					break;
+				case "普通器械包":
+					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_INSIDE);
+					break;
+				case "敷料包":
+					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_DRESSING);
+					break;
+				case "消毒物品":
+					tousseTypeSet
+							.add(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
+					break;
+				case "自定义器械包":
+					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_CUSTOM);
+					break;
+				case "外来器械包":
+					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_FOREIGN);
+					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_SPLIT);
+					break;
+				case "外部代理灭菌包":
+					tousseTypeSet
+							.add(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY);
+					break;
+				}
+			}
+		}
+		return tousseTypeSet;
+	}
 	/**
 	 * 拼接查询SQL的WHERE部分 根据时间段和多个orgUnitCoding获取未发货的发货计划单
 	 * @param orgUnitCodings
@@ -1016,34 +1052,7 @@
 		
 		//如果物品类型不为空时
 		if (StringUtils.isNotBlank(tousseType)) {
-			Set<String> tousseTypeSet = new HashSet<String>();
-			String[] tousseTypesArray = tousseType.split(",");
-			for (String type : tousseTypesArray) {
-				switch(type){
-				case "一次性物品":
-					tousseTypeSet.add(TousseItem.TYPE_DIPOSABLE_GOODS);
-					break;
-				case "普通器械包":
-					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_INSIDE);
-					break;
-				case "敷料包":
-					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_DRESSING);
-					break;
-				case "消毒物品":
-					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
-					break;
-				case "自定义器械包":
-					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_CUSTOM);
-					break;
-				case "外来器械包":
-					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_FOREIGN);
-					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_SPLIT);
-					break;
-				case "外部代理灭菌包":
-					tousseTypeSet.add(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY);
-					break;
-				}
-			}
+			Set<String> tousseTypeSet = buildTousseTypeSet(tousseType);
 			
 			if(!tousseTypeSet.isEmpty()){
 				// 新的传参方式
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r18146 -r18798
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 18146)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 18798)
@@ -8,6 +8,7 @@
 import java.util.Set;
 
 
+
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -102,6 +103,7 @@
 	public List<InvoicePlan> getInvoicePlanByOrgUnitCoding(
 			String orgUnitCoding, TimeQuantum timeQuantum);
 	
+	public Set<String> buildTousseTypeSet(String tousseType) ;
 	/**
 	 * 根据时间段和多个orgUnitCoding获取未发货的发货计划单
 	 */
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
===================================================================
diff -u -r18739 -r18798
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 18739)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 18798)
@@ -49,6 +49,8 @@
   departsForInvoicePlanSelectProject : "科教项目经费;自筹科教配套",
   //使用记录转申请单备注信息(如巡回护士:张三;病人:李四)
   useRecordConvertRecyclingApplicationRemark : '@circuitNurseLabelName:@circuitNurse;病人:@patientName',
+  // 发货计划列表的类型参数是否应用到发货界面
+  invoicePlanExtractedView_TousseTypeApplyToInvoiceForm:true,
   //预回收功能版本:1为只是修改回收数量(目前眼科使用,是原来从4.0升级过来的),2为使用记录转换的申请单预回收，可以扫描条码(目前中大附一使用的)
   prepareRecycleVersion:1,
   //一键回收是否启用,true为启用,否则为不启用