Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
===================================================================
diff -u -r28459 -r28469
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 28459)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 28469)
@@ -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) 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)*ci.materialAmount 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\" ";
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
===================================================================
diff -u -r28459 -r28469
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java	(.../SupplyRoomControlAction.java)	(revision 28459)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java	(.../SupplyRoomControlAction.java)	(revision 28469)
@@ -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) 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)*ci.materialAmount 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\" ";