Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27180 -r27228
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27180)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27228)
@@ -173,6 +173,7 @@
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.ForgonDateUtils;
 import com.forgon.tools.util.SqlUtils;
+import com.forgon.treenode.model.THTreeNode;
 import com.forgon.util.DefaultValue;
 
 import edu.emory.mathcs.backport.java.util.Arrays;
@@ -6126,12 +6127,11 @@
 	private List<InvoiceQuery> getInvoiceItems(Map<String,String> requestParams,String type) {
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		String depart = requestParams.get("depart");
+		String depart = requestParams.get("departCoding");
 		String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		//供应室可以查所有科室，临床科室只能看自己的科室
 		if(!supplyRoomConfigManager.isFirstOrSecondSupplyRoomOrgUnit(handleDeptCode)){
-			String orgUnitName =AcegiHelper.getLoginUser().getOrgUnitNameCodingFromSupplyRoomConfig();
-			if(StringUtils.isBlank(depart) || !depart.equals(orgUnitName)){
+			if(StringUtils.isBlank(depart) || !depart.equals(handleDeptCode)){
 				return new ArrayList<InvoiceQuery>();
 			}
 		}
@@ -6301,10 +6301,11 @@
 		sql += " where " + dateQueryAdapter.dateAreaSql("m.sendTime", startDate, endDate, true, true);
 		
 		if (StringUtils.isNotBlank(depart)) {
-			sql += " and m.depart = '" + depart + "'";
+			sql += " and m.departCoding = '" + depart + "'";
 		}
 		if (StringUtils.isNotBlank(settleDepartSearch)) {
-			sql += " and m.settleAccountsDepart = '" + settleDepartSearch + "'";
+			THTreeNode orgUnit =  orgUnitManager.getOrgUnitByCode(settleDepartSearch);
+			sql += " and m.settleAccountsDepart = '" + orgUnit.getName() + "'";
 		}
 		if (StringUtils.isNotBlank(applicant)) {
 			sql += " and m.applicant = '" + applicant + "'";
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
===================================================================
diff -u -r25907 -r27228
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js	(.../invoiceQueryView.js)	(revision 25907)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js	(.../invoiceQueryView.js)	(revision 27228)
@@ -8,8 +8,14 @@
 	function reloadReport(){
 		var startDate= Ext.getCmp('startDate').getRawValue();
 		var endDate= Ext.getCmp('endDate').getRawValue();
-		var departSearch = Ext.getCmp('departSearch').getRawValue();
+		var departSearch= Ext.getCmp('departSearch').getRawValue();
+		if(departSearch !=""){
+			departSearch = Ext.getCmp('departSearch').getValue();
+		}
 		var settleDepartSearch = Ext.getCmp('settleDepartSearch').getRawValue();
+		if(settleDepartSearch != ""){
+			settleDepartSearch = Ext.getCmp('settleDepartSearch').getValue();
+		}
 		var applicant = Ext.getCmp('applicant').getValue();
 		var goodsName = Ext.getCmp('goodsName').getRawValue();
 			goodsName = goodsName.replace(/\%/g,'%25');
@@ -65,7 +71,7 @@
 			jasperreportNameOfDetailedType = "invoiceItemsQuery_main_1AddSupplierName.jasper";
 		}
 		if(summaryType == "发货汇总"){
-			window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+jasperreportNameOfsummaryType+"&reportName=invoiceSummaryQuery&depart="
+			window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+jasperreportNameOfsummaryType+"&reportName=invoiceSummaryQuery&departCoding="
 					+ departSearch+ "&settleDepartSearch=" + settleDepartSearch 
 					+"&startDate=" + startDate + "&endDate=" +endDate
 					+ "&applicant=" + applicant + "&goodsName=" +goodsName + "&hasRemark=" +hasRemark
@@ -74,7 +80,7 @@
 					+ "&batchNumber=" + batchNumber + "&hospitalNumber=" +　hospitalNumber + "&tousseGroupName=" + tousseGroupName
 					+ "&invoiceDepartGroup=" + invoiceDepartGroup, 'thisIframe', '_self');
 		}else{
-			window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+jasperreportNameOfDetailedType+"&reportName=invoiceQuery&depart="
+			window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+jasperreportNameOfDetailedType+"&reportName=invoiceQuery&departCoding="
 					+ departSearch+ "&settleDepartSearch=" + settleDepartSearch 
 					+"&startDate=" + startDate + "&endDate=" +endDate
 					+ "&applicant=" + applicant + "&goodsName=" +goodsName + "&hasRemark=" +hasRemark
@@ -341,7 +347,7 @@
 						queryParam : 'spell',
 						fieldLabel : '申请科室',   
 						minChars : 0,
-						valueField : 'name',
+						valueField : 'id',
 						displayField : 'name',
 						store : departJsonStore,
 						forceSelection : true,
@@ -363,7 +369,7 @@
 						queryParam : 'spell',
 						fieldLabel : '结算科室',   
 						minChars : 0,
-						valueField : 'name',
+						valueField : 'id',
 						displayField : 'name',
 						store : departJsonStore,
 						forceSelection : true,