Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r18775 -r19517
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 18775)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 19517)
@@ -91,7 +91,7 @@
 	sterilizationStore.removeAll();
 	invoicePlanStore.removeAll();
 
-	var queryParam1 = {
+	var queryParam = {
         tousseName : goodName,
         tousseType : tousseType,
         startDate : startDate,
@@ -100,20 +100,12 @@
         department : department,
 		comboTousseType : comboTousseType
 	};
-	var queryParam2 = {
-        tousseName : goodName,
-        tousseType : tousseType,
-        startDate : startDate,
-        endDate : endDate,
-        taskGroup : taskGroup,
-		comboTousseType : comboTousseType
-	};
-    loadStoreByParams(applicationStore, queryParam1);
-    loadStoreByParams(washStore, queryParam2);
-    loadStoreByParams(packingStore, queryParam2);
-    loadStoreByParams(reviewStore, queryParam2);
-    loadStoreByParams(sterilizationStore, queryParam2);
-    loadStoreByParams(invoicePlanStore, queryParam1);
+    loadStoreByParams(applicationStore, queryParam);
+    loadStoreByParams(washStore, queryParam);
+    loadStoreByParams(packingStore, queryParam);
+    loadStoreByParams(reviewStore, queryParam);
+    loadStoreByParams(sterilizationStore, queryParam);
+    loadStoreByParams(invoicePlanStore, queryParam);
 }
 
 /**
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
===================================================================
diff -u -r18201 -r19517
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java	(.../PkRoomControlHelper.java)	(revision 18201)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java	(.../PkRoomControlHelper.java)	(revision 19517)
@@ -76,6 +76,10 @@
         if (StringUtils.isNotBlank(typeSql)){
             whereSql += String.format(" and %s", typeSql);
         }
+        //如果科室条件不为空,则增加科室的过滤条件
+        if(StringUtils.isNotBlank(supplyRoomVo.getDepartment())){
+        	whereSql = whereSql + " and po.depart='"+ supplyRoomVo.getDepartment() +"'";
+        }
         return whereSql;
 
     }
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
===================================================================
diff -u -r18201 -r19517
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java	(.../StRoomControlHelper.java)	(revision 18201)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java	(.../StRoomControlHelper.java)	(revision 19517)
@@ -64,6 +64,10 @@
                 + dateQueryAdapter.dateAdapter(supplyRoomVo.getStartDate())
                 + " and "
                 + dateQueryAdapter.dateAdapter(supplyRoomVo.getEndDate());
+        //如果科室条件不为空,则增加科室的过滤条件
+        if(StringUtils.isNotBlank(supplyRoomVo.getDepartment())){
+        	condition = condition + " and ti.depart='"+ supplyRoomVo.getDepartment() +"'";
+        }
         String joinedBasketWhereSql = "from TousseInstance ti left join TousseDefinition td on ti.toussename = td.name "
                 + "left join ReviewedBasket rb on rb.id = ti.reviewBasket_id "
                 + "left join Container c on c.id = rb.container_id "
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
===================================================================
diff -u -r18201 -r19517
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java	(.../RvRoomControlHelper.java)	(revision 18201)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java	(.../RvRoomControlHelper.java)	(revision 19517)
@@ -76,6 +76,10 @@
         if (StringUtils.isNotBlank(typeSql)){
             whereSql += String.format(" and %s", typeSql);
         }
+        //如果科室条件不为空,则增加科室的过滤条件
+        if(StringUtils.isNotBlank(supplyRoomVo.getDepartment())){
+        	whereSql = whereSql + " and po.depart='"+ supplyRoomVo.getDepartment() +"'";
+        }
         return whereSql;
     }
 
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
===================================================================
diff -u -r18201 -r19517
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java	(.../WdRoomControlHelper.java)	(revision 18201)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java	(.../WdRoomControlHelper.java)	(revision 19517)
@@ -62,12 +62,17 @@
                 + " left join ClassifyBasket_WashRecord cw on wr.id = cw.WashAndDisinfectRecord_ID"
                 + " left join ClassifyBasket cb on cb.id = cw.ClassifyBasket_ID"
                 + " left join ClassifiedItem ci on cb.id = ci.classifybasket_id "
+                + " left join RecyclingRecord rr on ci.recyclingRecordId=rr.id "
                 + " where wr.orgUnitCoding = '" + orgUnitCoding + "'"
                 + " and (ci.itemType = '材料' or ci.itemType in (" + SupplyRoomControlManagerImpl.TOUSSE_TYPE + "))"
                 + " and wr.recordCreateDate between "
                 + dateQueryAdapter.dateAdapter(startDate)
                 + " and "
                 + dateQueryAdapter.dateAdapter(endDate);
+        //如果科室条件不为空,则增加科室的过滤条件
+        if(StringUtils.isNotBlank(supplyRoomVo.getDepartment())){
+        	whereSql = whereSql + " and rr.depart='"+ supplyRoomVo.getDepartment() +"'";
+        }
 
         if (StringUtils.isNotBlank(tousseName)) {
             if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)) {