Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp
===================================================================
diff -u -r29860 -r29897
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp	(.../departmentMonthlyView.jsp)	(revision 29860)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp	(.../departmentMonthlyView.jsp)	(revision 29897)
@@ -26,7 +26,14 @@
     if(supplyRoomConfigManager.isExpensiveGoodsSupplyRoomUser()){
     	supplyRoomType = SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY;
     }
-    request.setAttribute("orgUnitName",orgUnitName);
+    if(SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM == supplyRoomType || SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM == supplyRoomType || SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY == supplyRoomType){
+    	request.setAttribute("orgUnitName",orgUnitName);
+    }else{
+    	SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getApplyDepartDefaultSettleDepart(orgUnitCoding);
+   		if(supplyRoomConfig!=null){
+   			request.setAttribute("orgUnitName",supplyRoomConfig.getOrgUnitName());
+   		}
+	}
     request.setAttribute("supplyRoomType",supplyRoomType);
  %>
  <script type="text/javascript">
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r29894 -r29897
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29894)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29897)
@@ -5081,7 +5081,7 @@
 		if (StringUtils.isNotBlank(departSearch)) {
 			departFilterSql = " and i.settleaccountsdepart = '" + departSearch
 					+ "'";
-			returnGoodsFilterSql += " and rr.depart = '" + departSearch
+			returnGoodsFilterSql += " and rr.departCoding = '" + invoicePlanDepartCoding
 					+ "'";
 			returnGoodsDepartFilterSql = " and rr.depart = '" + departSearch
 					+ "'";
@@ -5470,7 +5470,7 @@
 					+ " left join " + DisposableGoodsBatchStock.class.getSimpleName() + " dgbs on ri.disposableGoodsBatchStockID=dgbs.id"
 					+ " where " + getHandleDeptCodeSql("rr.handleDepartCode")+" "
 					+ returnGoodsFilterSql
-					+ rrDepartCodingSql
+					+ SqlUtils.getWhereSqlByfilterFieldAndStringValue("rr.settleAccountsDepartCoding", departCoding)
 					+" and "+returnGoodsItemPredicate
 					+ " group by rr.depart,rr.settleAccountsDepart,ri.toussename,"+returnGoodsTousseType+",ri.batchNumber,dgbs.expDate,"+returnGoodsTousseDefinitionId+ dgbsOfSupplierNameSql +") ";