Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r20299 -r26152
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 20299)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 26152)
@@ -470,7 +470,7 @@
 	   
 	    //清洗记录信息
 	    var washColumns = new Ext.grid.ColumnModel([
-            {header : "器械包名称",width : 180,dataIndex : 'tousseName'},
+            {header : "器械包/材料名称",width : 180,dataIndex : 'tousseName'},
             {header : "数量",width : 50,dataIndex : 'amount'/*, renderer : renderColor*/}, 
             {header : "回收清洗筐",width : 100,dataIndex : 'basketName'},
             {header : "清洗人",width : 60,dataIndex : 'operator'/*, renderer : renderColor*/},
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
===================================================================
diff -u -r20299 -r26152
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java	(.../RaRoomControlHelper.java)	(revision 20299)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java	(.../RaRoomControlHelper.java)	(revision 26152)
@@ -91,7 +91,9 @@
                 " left join RecyclingRecord rr on rr.recyclingApplication_id = ip.id" +
                 " left join RecyclingItem ri on rr.id = ri.recyclingRecord_id and ri.tousseDefinitionId = po.toussedefinitionid "
                 + " where ip.type in (%s) and (ip.applicationTime between %s and %s or ip.recyclingTime between %s and %s) "
-                + " and ip.committedStatus = 1 and (ip.recyclingStatus != '%s' or ip.recyclingStatus is null)", SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE, startDateStr, endDateStr, startDateStr, endDateStr, InvoicePlan.STATUS_END);
+                + " and ip.committedStatus = 1 "
+                //+ "and (ip.recyclingStatus != '%s' or ip.recyclingStatus is null)"
+                , SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE, startDateStr, endDateStr, startDateStr, endDateStr);
         //因为自定义回收的不产生申请单，所以RecyclingRecord的recyclingApplication_id是为空,因此要union上RecyclingRecord表中rr.recyclingApplication_id为空的数据
         String unionWhere = this.buildUnionSql(supplyRoomVo);
         whereSql += " union " + unionWhere + ") po where 1=1 ";
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r19054 -r26152
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 19054)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 26152)
@@ -67,8 +67,9 @@
 	 		 + InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION + "','"
 	 		 + InvoicePlan.TYPE_PROXYDISINFECTION + "','"
 	 		 + InvoicePlan.TYPE_QUALITY_MONITOR_RECYCLE_APPLICATION + "','"
+	 		 + InvoicePlan.TYPE_APPLYING_FOR_RETURN_FORM + "','"
+	 		 + InvoicePlan.TYPE_BORROWINGSINGLE + "','"
 	 		 + InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION+"'";
-	
 	//器械包类型
 	public static final String TOUSSE_TYPE = "'"
 			 + TousseDefinition.PACKAGE_TYPE_INSIDE+"','"
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
===================================================================
diff -u -r19517 -r26152
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java	(.../WdRoomControlHelper.java)	(revision 19517)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java	(.../WdRoomControlHelper.java)	(revision 26152)
@@ -63,6 +63,7 @@
                 + " 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 "
+                + " left join TousseDefinition td on ci.tousseDefinitionID=td.id "
                 + " where wr.orgUnitCoding = '" + orgUnitCoding + "'"
                 + " and (ci.itemType = '材料' or ci.itemType in (" + SupplyRoomControlManagerImpl.TOUSSE_TYPE + "))"
                 + " and wr.recordCreateDate between "
@@ -79,7 +80,7 @@
                 whereSql += " and (ci.tousseNameForMaterial like '%" + tousseName + "%' or (ci.itemType = '" + TousseDefinition.PACKAGE_TYPE_DISINFECTION + "' and ci.name = '" + tousseName + "'))";
             }
             else {
-                whereSql += " and ci.name = '" + tousseName + "'";
+                whereSql += " and td.name = '" + tousseName + "'";
             }
         }
         if (StringUtils.isNotBlank(taskGroup) && !"全部".equals(taskGroup)) {