Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java
===================================================================
diff -u -r37645 -r37646
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java	(.../YearWorkloadReportHelper.java)	(revision 37645)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java	(.../YearWorkloadReportHelper.java)	(revision 37646)
@@ -136,8 +136,8 @@
 		dateStrSet.add(lastYear + "-12");
 		
 		List<YearWorkloadBean> lastBeans = getYearWorkloadReport(dateStrSet, "mm",lastStartDate,lastEndDate,lastYear+"", queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);
-		List<YearWorkloadBean> lastBeanSum = getSumBeans(lastBeans, lastYear+"年");
 		
+		
 		dateStrSet.clear();
 		dateStrSet.add(year + "-01");
 		dateStrSet.add(year + "-02");
@@ -153,8 +153,9 @@
 		dateStrSet.add(year + "-12");
 		
 		List<YearWorkloadBean> beans = getYearWorkloadReport(dateStrSet, "mm",startDate,endDate,year+"", queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);
+		fillingInVacantBeans(beans, lastBeans, lastYear+"年", year+"年");
 		List<YearWorkloadBean> beanSum = getSumBeans(beans, year+"年");
-		fillingInVacantBeans(beanSum, lastBeanSum, lastYear+"年", year+"年");
+		List<YearWorkloadBean> lastBeanSum = getSumBeans(lastBeans, lastYear+"年");
 		return addComparisonBeans("同比", lastBeanSum, beanSum);
 	}
 	/**
@@ -190,14 +191,16 @@
 		}
 		dateStrSet.add(lastYear + "-" + month);
 		List<YearWorkloadBean> lastBeans = getYearWorkloadReport(dateStrSet, "mm",lastStartDate,lastEndDate,lastYear+"", queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);
-		List<YearWorkloadBean> lastBeanSum = getSumBeans(lastBeans, lastYear+"年"+ month +"月");
 		
+		
 		dateStrSet.clear();
 		dateStrSet.add(year + "-" + month);
 		List<YearWorkloadBean> beans = getYearWorkloadReport(dateStrSet, "mm",startDate,endDate,year+"", queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);
+		fillingInVacantBeans(beans, lastBeans, lastYear+"年"+ month +"月", year+"年"+ month +"月");
+		List<YearWorkloadBean> lastBeanSum = getSumBeans(lastBeans, lastYear+"年"+ month +"月");
 		List<YearWorkloadBean> beanSum = getSumBeans(beans, year+"年"+ month +"月");
 		
-		fillingInVacantBeans(beanSum, lastBeanSum, lastYear+"年"+ month +"月", year+"年"+ month +"月");
+		
 		return addComparisonBeans("同比", lastBeanSum, beanSum);
 	}
 	/**
@@ -281,11 +284,11 @@
 		}
 		
 		List<YearWorkloadBean> lastBeans = getYearWorkloadReport(lastDateStrSet, "mm",lastStartDate,lastEndDate,lastYear+"", queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);
-		List<YearWorkloadBean> lastBeanSum = getSumBeans(lastBeans, lastYear+quarterlyName);
 		
 		List<YearWorkloadBean> beans = getYearWorkloadReport(dateStrSet, "mm",startDate,endDate,year+"", queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);
+		fillingInVacantBeans(beans, lastBeans, lastYear+quarterlyName, year+quarterlyName);
+		List<YearWorkloadBean> lastBeanSum = getSumBeans(lastBeans, lastYear+quarterlyName);
 		List<YearWorkloadBean> beanSum = getSumBeans(beans, year+quarterlyName);
-		fillingInVacantBeans(beanSum, lastBeanSum, lastYear+quarterlyName, year+quarterlyName);
 		return addComparisonBeans("同比", lastBeanSum, beanSum);
 	}
 	/**
@@ -311,7 +314,7 @@
 		dateStrSet.add(lastYear + "-05");
 		dateStrSet.add(lastYear + "-06");
 		List<YearWorkloadBean> lastBeans = getYearWorkloadReport(dateStrSet, "mm",lastStartDate,lastEndDate,lastYear+"", queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);
-		List<YearWorkloadBean> lastSums = getSumBeans(lastBeans,lastYear + "上半年");
+		
 
 		String startDate = year + "-01-01 00:00:00";
 		String endDate = year + "-07-01 00:00:00";
@@ -323,8 +326,10 @@
 		dateStrSet.add(year + "-05");
 		dateStrSet.add(year + "-06");
 		List<YearWorkloadBean> beans = getYearWorkloadReport(dateStrSet, "mm",startDate,endDate,year, queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);
+		fillingInVacantBeans(beans, lastBeans, lastYear + "上半年", year + "上半年");
 		List<YearWorkloadBean> beanSum = getSumBeans(beans,year + "上半年");
-		fillingInVacantBeans(beanSum, lastSums, lastYear + "上半年", year + "上半年");
+		List<YearWorkloadBean> lastSums = getSumBeans(lastBeans,lastYear + "上半年");
+		
 		return addComparisonBeans("同比", lastSums, beanSum);
 	}
 	/**
@@ -412,10 +417,10 @@
 			dateStrSet.clear();
 			dateStrSet.add(yearMonth);
 			List<YearWorkloadBean> lastBeans = getYearWorkloadReport(dateStrSet, "mm",startTime,endTime,year, queryMonth, querySupplyRoom, isAddEndoscopic, isStatisticDisposableGoodsSendAmount, parametMap);					
-			
+			fillingInVacantBeans(beans, lastBeans, lastMonth, yearMonth);
 			List<YearWorkloadBean> thisYearWorkloadBeans = getSumBeans(beans, lastMonth);
 			List<YearWorkloadBean> lastYearWorkloadBeans = getSumBeans(lastBeans, yearMonth);
-			fillingInVacantBeans(thisYearWorkloadBeans, lastYearWorkloadBeans, lastMonth, yearMonth);
+			
 			if(thisYearWorkloadBeans.size() > 0){
 				DecimalFormat df = new DecimalFormat("0.0000");
 				df.applyPattern("0.00");