Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r21412 -r21502
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21412)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21502)
@@ -9778,7 +9778,7 @@
 			
 			//回收记录 
 			String  tousseAmountSql  = String.format("select '回收数量' type,rr.recyclingUser userName,sum(ti.amount) amount from RecyclingRecord rr,RecyclingItem ti "
-						+ "where ti.recyclingRecord_id = rr.id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.recyclingUser) <> 0"
+						+ "where ti.recyclingRecord_id = rr.id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.recyclingUser) <> 0 "
 						+ "group by rr.recyclingUser ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
 					
 			        tousseAmountSql += " union all ";
@@ -9896,7 +9896,7 @@
 			
 			//回收记录 
 			String  materialAmountSql  = String.format("select '回收数量' type,rr.recyclingUser userName,sum(ti.amount * ms.count) amount from RecyclingRecord rr,RecyclingItem ti,tousseDefinition td,materialInstance ms "
-						+ "where ti.recyclingRecord_id = rr.id and ti.tousseDefinitionId = td.id and td.id = ms.tousse_id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.recyclingUser) <> 0"
+						+ "where ti.recyclingRecord_id = rr.id and ti.tousseDefinitionId = td.id and td.id = ms.tousse_id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.recyclingUser) <> 0 "
 						+ "group by rr.recyclingUser ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
 					
 			        materialAmountSql += " union all ";
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r21345 -r21502
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 21345)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 21502)
@@ -8,8 +8,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
-
 import net.sf.jasperreports.engine.JasperPrint;
 
 import com.forgon.disinfectsystem.entity.disposablegoods.DisposableGoodsInventory;
@@ -23,12 +21,12 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartMentTousseOperate;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartmentMonthDetail;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.DeviceMaintenanceBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.DeviceMaintenanceCusBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.DisinfectionFractionDefectiveBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.EighteenQuotaBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseAfterUseDeliveryVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseApplicationVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseSterilizationMonitorAndDeliveryVO;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.FormInstanceVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryItemVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryStatistic_main;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.GoodsAmountSummaryByGrade;
@@ -45,16 +43,15 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationDetail_main;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationSum_main;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.PackingFractionDefectiveBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.QualityMonitoringInspectBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SignGoodsItemVo;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.StatisticalWorkload;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationAreaWorkLoadBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove_child;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordForGoodsVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseApplyDepartment;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseApplySummary;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseDeliverDetailVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseMorrowSendBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseOverLoadBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseSpecificationSizeStatistics;
@@ -64,17 +61,12 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.UrgentNeedGoodsProcessingCycle;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordEnteringBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordItemBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WashFractionDefectiveChartBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.WashWorkload_main;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkQualityCollection;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.StatisticalWorkload;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoadReportBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.FormInstanceVo;
 import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking;
-import com.forgon.tools.StrutsParamUtils;
 
 /**
  * @author wangyi 2012-08-15 上午12:04