Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
===================================================================
diff -u -r23155 -r23211
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java	(.../InvoicePlanAction.java)	(revision 23155)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java	(.../InvoicePlanAction.java)	(revision 23211)
@@ -486,7 +486,7 @@
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-		String sterilingMethods = StrutsParamUtils.getPraramValueAndDecode("sterilingMethods", null, "utf-8");
+		String sterilingMethods = StrutsParamUtils.getPraramValueAndDecode("sterilingMethods", "", "utf-8");
 		JSONArray jsonArray = invoicePlanManager
 				.getInvoicePlansByOrgAndTousseType(Arrays.asList(departCodes),applyDate ,tousseType,disposableGoodsType,sterilingMethods);
 		StrutsResponseUtils.output(jsonArray);
Index: ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js
===================================================================
diff -u -r23160 -r23211
--- ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js	(.../portalPage.js)	(revision 23160)
+++ ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js	(.../portalPage.js)	(revision 23211)
@@ -794,6 +794,34 @@
 	}
 }
 
+function getCurrentTab() { 
+	//var iframes = getById('personalDesktop').query("*[class=iframeClass]");
+	var iframes = Ext.query("*[class=iframeClass]");
+	var window;
+	Ext4.each(iframes,function(){
+		if(getElement(this).isVisible(true)){
+			if(Ext4.isIE) {
+				//IE 6,7 不支持contentDocument
+				window = this.contentWindow;
+				//window = document.frames['desktopIframe'];此写法有问题，得到的是最后打开的iframe
+				if(window.document.frames['mainFrame'] != null){
+					if('mainFrame'==window.document.frames['mainFrame'].name){
+						window = window.document.frames['mainFrame'];
+					}
+				}
+			} else {
+				// var context = getElement(this).context;
+				var context = this;
+				window = context.contentWindow;
+				if('iframe_enterpriseView'==context.id) {
+					window = context.contentDocument.getElementById('mainFrame').contentWindow;
+				}
+			}
+		}
+	});
+	return window;
+}
+
 function initShowSystemWarningWin(){
 	doShowSystemWarningWinByParam(true);
 }