Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r35933 -r35935
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 35933)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 35935)
@@ -20,7 +20,6 @@
 import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockTakeRecord;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.AdverseEventRecordReportVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ApparatusInfusionisType;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.InstrumentRepairVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.BiologicalMonitoringReportVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.BorrowingRecordItemVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.BorrowingRecordVo;
@@ -44,6 +43,7 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryStatistic_main;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.GoodsAmountSummaryByGrade;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.GoodsRiskLevelReportVo;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.InstrumentRepairVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceAmountContrastBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQuery;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQueryItem;
@@ -57,6 +57,7 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportChartBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.NurseWorkloadBean;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.OperatingRoomUseRecortSumBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.OperatingRoomUseReportDepartVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationDetail_main;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationSum_main;
@@ -96,9 +97,8 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WaitPackingTaskReportBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WashAndDisinfectRecordItemBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WashFractionDefectiveChartBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkloadScoreStatisticReportVo;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.OperatingRoomUseRecortSumBean;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
 import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking;
 
 /**
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r35919 -r35935
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 35919)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 35935)
@@ -84,9 +84,6 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.FirstColumnVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseAfterUseDeliveryVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQueryItem;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialDamageBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialDamageItemBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialDamageTotal_child;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialErrorDamageSummaryOfDepartmentVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportBeanWith2Column;
@@ -118,7 +115,6 @@
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
-import com.forgon.tools.util.ForgonDateUtils;
 import com.forgon.tools.util.SqlUtils;
 /**
  * @author wangyi 2012-08-15 下午12:04