Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r22992 -r23157
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 22992)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 23157)
@@ -1259,7 +1259,8 @@
 			orgUnitCoding + '&applyDate=' + 
 			selectedApplyDate + '&tousseType=' + 
 			encodeURI(selectedTousseType)+ '&disposableGoodsType=' +
-			encodeURI(selectedDisposableGoodsType),
+			encodeURI(selectedDisposableGoodsType)+ '&sterilingMethods=' +
+			encodeURI(selectedSterilingMethods),
 			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader({fields : [{name : 'id'},{name : 'typeAndserialNumber'},{name : 'remark'}]}),
@@ -1326,6 +1327,7 @@
 		recyclingapplicationStore.baseParams['applyDate'] = selectedApplyDate;
 		recyclingapplicationStore.baseParams['tousseType'] = encodeURI(selectedTousseType);
 		recyclingapplicationStore.baseParams['disposableGoodsType'] = encodeURI(selectedDisposableGoodsType);
+		recyclingapplicationStore.baseParams['sterilingMethods'] = encodeURI(selectedSterilingMethods);
 		
 		if(top.Ext.getCmp("sendOutGoodsDetail")){
 			top.Ext.getCmp("sendOutGoodsDetail").getEl().mask("加载中,请稍候...");
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r22584 -r23157
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 22584)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 23157)
@@ -1,7 +1,12 @@
+<%@page import="org.apache.velocity.runtime.directive.Foreach"%>
+<%@page import="net.sf.json.JSONArray"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="com.forgon.disinfectsystem.entity.tousseitem.TousseItem"%>
 <%@page import="java.util.Calendar"%>
+<%@page import="com.forgon.disinfectsystem.packing.service.PackingManager,com.forgon.tools.SpringBeanManger"%>
 <%@page import="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
@@ -42,6 +47,20 @@
 	String sixDaysAgo = sdf.format(cal.getTime());//6天前(近一周的起始日)
 	pageContext.setAttribute("lastSixDays", sixDaysAgo + ";" + today);
 	
+	SterilisationManager sterilisationManager = (SterilisationManager)SpringBeanManger.getBean("sterilisationManager");
+	List<Sterilisation> allSterilisationList = sterilisationManager.getAllSterilisation();
+	
+	JSONArray allSterilisationJSONArray = new JSONArray();
+	if(allSterilisationList != null){
+		for(Sterilisation sterilisation : allSterilisationList){
+			JSONArray sterilisationJSONArray = new JSONArray();
+			sterilisationJSONArray.add(sterilisation.getSterilisation());
+			sterilisationJSONArray.add(sterilisation.getSterilisation());
+			
+			allSterilisationJSONArray.add(sterilisationJSONArray);
+		}
+	}
+	pageContext.setAttribute("allSterilisationStr", allSterilisationJSONArray.toString());
 %>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js"></script>
@@ -105,6 +124,7 @@
  //物品类型下拉选项数据
  //var tousseTypeDataArray = [['一次性物品','<%=TousseItem.DIPOSABLE_YES %>'],['非一次性物品','<%=TousseItem.DIPOSABLE_NO %>']];
  var tousseTypeDataArray = [['一次性物品','一次性物品'],['普通器械包','普通器械包'],['敷料包','敷料包'],['消毒物品','消毒物品'],['自定义器械包','自定义器械包'],['外来器械包','外来器械包'],['外部代理灭菌包','外部代理灭菌包']];
+ var sterilingMethodArray = ${allSterilisationStr};
  //已选择的条件(申请日期、物品类型、申请单号)
  var selectedApplyDate = "";
  var selectedTousseType = "";
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r22579 -r23157
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 22579)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 23157)
@@ -10,6 +10,7 @@
 var selectedApplyDate;
 var selectedTousseType;
 var selectedDisposableGoodsType = '';
+var selectedSterilingMethods = '';
 var appFormType = '';
 var invoiceDepartGroups = '';
 var appDepartCode = '';
@@ -59,6 +60,11 @@
 	}
 	
 }
+function selectSterilingMethodsOnLoad(){
+	if(sstsConfig.invoicePlanExtractedView_showSterilingMethods){
+		Ext.getCmp('sterilingMethods').selectAll();
+	}
+}
 function onDisposableGoodsTousseTypeChange(combo, record){
 	if(!sstsConfig.invoicePlanExtractedView_showDisposableGoodsType){
 		return ;
@@ -81,6 +87,10 @@
 	if(sstsConfig.invoicePlanExtractedView_showDisposableGoodsType){
 		selectedDisposableGoodsType = Ext.getCmp('disposableGoodsType').getValue();
 	}
+	if(sstsConfig.invoicePlanExtractedView_showSterilingMethods){
+		selectedSterilingMethods = Ext.getCmp('sterilingMethods').getValue();
+	}
+	
 	appDepartCode = Ext.getCmp('appDepart').getValue();
 	if(!isUndefinedOrNullOrEmpty(appDepartCode)){
 		invoiceDepartGroups = appDepartCode;
@@ -114,6 +124,7 @@
 		store.baseParams['applyDate'] = selectedApplyDate;
 		store.baseParams['tousseType'] = selectedTousseType;
 		store.baseParams['disposableGoodsType'] = selectedDisposableGoodsType;
+		store.baseParams['sterilingMethods'] = selectedSterilingMethods;
 		store.baseParams['appFormType'] = appFormType;
 		//刷新列表界面
 		store.load();
@@ -436,6 +447,7 @@
 		view_recyclingapplicationStore.baseParams['applyDate'] = selectedApplyDate;
 		view_recyclingapplicationStore.baseParams['tousseType'] = encodeURI(selectedTousseType);
 		view_recyclingapplicationStore.baseParams['disposableGoodsType'] = encodeURI(selectedDisposableGoodsType);
+		view_recyclingapplicationStore.baseParams['sterilingMethods'] = encodeURI(selectedSterilingMethods);
 	});
 	
 	
@@ -651,14 +663,49 @@
 							}
 						},
 						anchor : '95%'
+					}, {
+						text : '灭菌程序:',
+						hidden : !sstsConfig.invoicePlanExtractedView_showSterilingMethods
+					},{
+						xtype : 'multiSelect',
+						id : 'sterilingMethods',
+						name : 'sterilingMethods',
+						hidden : !sstsConfig.invoicePlanExtractedView_showSterilingMethods,
+						valueField : 'value',
+						displayField : 'key',
+						allowBlank : true,
+						editable : false,
+						fieldLabel:'类型',
+						width : 150,
+						emptyText:'请选择物品类型',
+						mode:'local',
+						store : new Ext.data.SimpleStore({
+							data: sterilingMethodArray,
+							fields:['key','value']
+						}),
+//						forceSelection : true,
+						triggerAction : 'all',
+						listeners : {
+							select : function(combo, record, index){
+								refreshList();
+							},
+							beforeselect:function(combo, record, index){
+								var c = record.get(combo.checkField);
+								if(combo.getCheckedCount() <= 1 && c){
+									return false;
+								}
+								return true;
+							}
+						},
+						anchor : '95%'
 					}
 					]
 	        	});
 	        	var c = Ext.getCmp('container_panel');
 	        	tbar2.render(c.tbar);
 	        	// 自动加载列表
 	        	selectTousseTypeOnLoad();
-				
+	        	selectSterilingMethodsOnLoad();
 	        }
 		}
         }]