Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
===================================================================
diff -u -r30483 -r30490
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java	(.../DisposableGoodsStorageRecordManagerImpl.java)	(revision 30483)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java	(.../DisposableGoodsStorageRecordManagerImpl.java)	(revision 30490)
@@ -493,7 +493,7 @@
 			sb.append(" union all ");
 			
 			//供应室领用
-			sb.append("select '供应室领用' as type,'' as subType,rri.warehouseName as warehouseName,dg.name,dg.specification, rri.amount,rri.price as price,(rri.amount*rri.price) as totalPrice ");
+			sb.append("select '供应室领用' as type,'' as subType,rri.warehouseName as warehouseName,dg.name,dg.specification, sum(rri.amount) as amount,rri.price as price,sum(rri.amount*rri.price) as totalPrice ");
 			sb.append("from ReceiveRecord rr ");
 			sb.append("join ReceiveRecordItem rri on rri.receiveRecord_id = rr.id ");
 			sb.append("join DisposableGoods dg on dg.id = rri.disposableGoodsId ");
@@ -506,6 +506,7 @@
 			sb.append(dateQueryAdapter.dateAreaSql("rr.time", startDate, endDate, true, true));
 			sb.append("and ");
 			sb.append(SqlBuilder.build_number_IN_Statement("rri.warehouseId", SqlBuilder.IN, warehosueIds));
+			sb.append("group by rri.warehouseName,dg.name,dg.specification,rri.price ");
 		}else{
 			//发货记录
 			sb.append("select '发货单' as type,'发货出库' as subType,i.sourceWarehouseName as warehouseName,dg.name,dg.specification,sum(dgi.amount) as amount,dgi.price as price, sum(dgi.amount*dgi.price) as totalPrice ");