Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35940 -r35952
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35940)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35952)
@@ -582,76 +582,6 @@
 			String endDate, String tousseName, String orgUnit,String tousseType, String tousseGroupName, String sterilizationMode){
 		return informationOfDepartmentOperationMonitoringHelper.getSummaryInformationOfDepartmentOperationMonitoring(startDate, endDate, tousseName, orgUnit, tousseType, tousseGroupName, sterilizationMode);
 	}
-
-	/**
-	 * 根据年度或季度或月份获取查询时间
-	 * 
-	 * @param queryTime
-	 * @param queryYear
-	 * @param queryMonth
-	 * @return
-	 */
-	private Map<String, String> getQueryDate(String queryTime,
-			String queryYear, String queryMonth) {
-		Map<String, String> map = new HashMap<String, String>();
-		String startDay = "";
-		String endDay = "";
-		String timeType = "";
-
-		if ("按年度".equals(queryTime)) {
-
-			startDay = queryYear.replace("年", "-01-01 00:00:00");
-			endDay = queryYear.replace("年", "-12-31 23:59:59");
-			timeType = queryYear;
-
-		} else if ("按季度".equals(queryTime)) {
-
-			if ("第一季度".equals(queryMonth)) {
-
-				startDay = queryYear.replace("年", "-01-01 00:00:00");
-				endDay = queryYear.replace("年", "-03-31 23:59:59");
-				timeType = queryYear + queryMonth;
-
-			} else if ("第二季度".equals(queryMonth)) {
-
-				startDay = queryYear.replace("年", "-04-01 00:00:00");
-				endDay = queryYear.replace("年", "-06-30 23:59:59");
-				timeType = queryYear + queryMonth;
-
-			} else if ("第三季度".equals(queryMonth)) {
-
-				startDay = queryYear.replace("年", "-07-01 00:00:00");
-				endDay = queryYear.replace("年", "-09-30 23:59:59");
-				timeType = queryYear + queryMonth;
-
-			} else if ("第四季度".equals(queryMonth)) {
-
-				startDay = queryYear.replace("年", "-10-01 00:00:00");
-				endDay = queryYear.replace("年", "-12-31 23:59:59");
-				timeType = queryYear + queryMonth;
-			}
-
-		} else if ("按月份".equals(queryTime)) {
-
-			String[] dateArray = queryMonth.split("#");
-			startDay = dateArray[0];
-			endDay = dateArray[1];
-
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月份");
-			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM");
-
-			try {
-				Date temp = sdf2.parse(startDay);
-				timeType = sdf.format(temp);
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-		}
-		map.put("startDay", startDay);
-		map.put("endDay", endDay);
-		map.put("timeType", timeType);
-		return map;
-	}
 	private Map<String, Integer> getWarehouseData(String sql,
 			Map<String, Integer> diposableGoodsMap) {