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 = "";