Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r28443 -r28459
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 28443)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 28459)
@@ -882,7 +882,7 @@
 			}
 		}},
 		{ header: "器械包/材料名称", width: 150, dataIndex: 'tousseName' },
-		{ header: "数量", width: 50, dataIndex: 'amount'},
+		{ header: "器械件数", width: 60, dataIndex: 'amount'},
 		{ header: "回收清洗筐", width: 90, dataIndex: 'basketName' },
 		{ header: "清洗人", width: 60, dataIndex: 'operator'},
 		{ header: "清洗机", width: 80, dataIndex: 'disinfectIdentification'},
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
===================================================================
diff -u -r28409 -r28459
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java	(.../SupplyRoomControlAction.java)	(revision 28409)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java	(.../SupplyRoomControlAction.java)	(revision 28459)
@@ -301,7 +301,7 @@
 			        "wr.operator as \"operator\",wr.disinfectIdentification as \"disinfectIdentification\"," +
 			        "wr.disinfectProgram as \"disinfectProgram\",cb.containerName as \"basketName\",ci.itemType as \"itemType\" ";
 		supplyQueryParamVo.setSelecetColumnForMaterial(selecetColumnForMaterial);
-        String selecetColumnForNotMaterial = " union all select wr.id as \"id\",ci.name as \"tousseName\",(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*ci.materialAmount as \"amount\"," +
+        String selecetColumnForNotMaterial = " union all select wr.id as \"id\",ci.name as \"tousseName\",(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end) as \"amount\"," +
                 "wr.startDate as \"startDate\",wr.endDate as \"endDate\"," +
                 "wr.operator as \"operator\",wr.disinfectIdentification as \"disinfectIdentification\"," +
                 "wr.disinfectProgram as \"disinfectProgram\",cb.containerName as \"basketName\",ci.itemType as \"itemType\" ";
@@ -354,8 +354,6 @@
 			obj.put("leaf", true);//前台需要
 			obj.put("iconCls", "task");//前台需要
 		}
-		String sadf = dataArr.toString();
-		System.out.println("添加前台需要的信息" + sadf);
 		return dataArr.toString();
 	}
 	/**
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
===================================================================
diff -u -r28422 -r28459
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 28422)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 28459)
@@ -198,7 +198,7 @@
 		        "wr.operator as \"operator\",wr.disinfectIdentification as \"disinfectIdentification\"," +
 		        "wr.disinfectProgram as \"disinfectProgram\",cb.containerName as \"basketName\",ci.itemType as \"itemType\" ";
     	supplyQueryParamVo.setSelecetColumnForMaterial(selecetColumnForMaterial);
-    	String selecetColumnForNotMaterial = " union all select wr.id as \"id\",ci.name as \"tousseName\",(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*ci.materialAmount as \"amount\"," +
+    	String selecetColumnForNotMaterial = " union all select wr.id as \"id\",ci.name as \"tousseName\",(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end) as \"amount\"," +
             "wr.startDate as \"startDate\",wr.endDate as \"endDate\"," +
             "wr.operator as \"operator\",wr.disinfectIdentification as \"disinfectIdentification\"," +
             "wr.disinfectProgram as \"disinfectProgram\",cb.containerName as \"basketName\",ci.itemType as \"itemType\" ";