Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r29860 -r29910
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 29860)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 29910)
@@ -190,7 +190,7 @@
 		 });
 		 var DepartRecord = Ext.data.Record.create(departProperties);
  		 var departRecord = new DepartRecord({
- 			 id : 1,
+ 			 id : orgUnitCoding,
  			 name : orgUnitName,
  			 orgUnitName : orgUnitName
  		 });
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r29901 -r29910
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29901)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29910)
@@ -5078,12 +5078,12 @@
 		String departFilterSql = "";
 		String packingDisposableGoodsDepartSql = "";
 		String chargeDepartSql = "";
+		if(StringUtils.isNotBlank(invoicePlanDepartCoding)){
+			returnGoodsFilterSql += " and rr.departCoding = '" + invoicePlanDepartCoding + "'";
+		}
 		if (StringUtils.isNotBlank(departSearch)) {
 			departFilterSql = " and i.settleaccountsdepart = '" + departSearch
 					+ "'";
-			if(StringUtils.isNotBlank(invoicePlanDepartCoding)){
-				returnGoodsFilterSql += " and rr.departCoding = '" + invoicePlanDepartCoding + "'";
-			}
 			returnGoodsDepartFilterSql = " and rr.depart = '" + departSearch
 					+ "'";
 			packingDisposableGoodsDepartSql = " and pr.orgUnitName = '" + departSearch + "'";