Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14365 -r14383
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14365)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14383)
@@ -8444,8 +8444,8 @@
 					+ "'" + GodownEntry.TYPE_OUT + "' as type,'供应室领用' as subType" 
 					+" from " + ReceiveRecord.class.getSimpleName() + " rr left join " 
 					+ ReceiveRecordItem.class.getSimpleName() + " rri on rr.id = rri.receiveRecord_id"
-					+ " left join " + DisposableGoodsBatchStock.class.getSimpleName() + " dbs on rri.diposableGoodBatchStock_id = dbs.id"
-					+" left join " + DisposableGoods.class.getSimpleName() + " dg on dg.id=dbs.disposableGoodsID"  
+					//+ " left join " + DisposableGoodsBatchStock.class.getSimpleName() + " dbs on rri.diposableGoodBatchStock_id = dbs.id"
+					+" left join " + DisposableGoods.class.getSimpleName() + " dg on dg.id=rri.disposableGoodsId"  
 					+ " where rri.type='一次性物品' and rr.warehouseId="+currentRecord.getWarehouseId();
 			if(StringUtils.isBlank(startDate)){
 				supplyRoomDiposableGoodsSql += " and rr.time < " + endDate;
@@ -8491,6 +8491,7 @@
 			sql += " union all " + supplyRoomDiposableGoodsSql;
 			sql += " union all " + packingRecordUsedSql;
 			sql += " union all " + returnGoodsSql;
+			//System.out.println(sql);
 			rs = objectDao.executeSql(sql);
 			try {
 				while(rs.next()){