Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RinserStoveUseCountReportHelper.java
===================================================================
diff -u -r35866 -r35867
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RinserStoveUseCountReportHelper.java	(.../RinserStoveUseCountReportHelper.java)	(revision 35866)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RinserStoveUseCountReportHelper.java	(.../RinserStoveUseCountReportHelper.java)	(revision 35867)
@@ -78,51 +78,47 @@
 	public List<RinserStove_child> getRinserStoveUseCountDetailData(
 			String startTime, String endTime, String depart, String departCoding) {
 		Map<String ,RinserStove_child> keyResultMap = new HashMap<String ,RinserStove_child>();
-		try{
-			String sql = " SELECT disinfectIdentification,endDate from WashAndDisinfectRecord wr where wr.endDate between "
-					+ dateQueryAdapter.dateConverAdapter2( startTime
-							, "yyyy-mm-dd  HH24:MI")
-					+ " and " + ""
-					+ dateQueryAdapter.dateConverAdapter2( endTime
-							, "yyyy-mm-dd  HH24:MI")
-					+ " and wr.orgUnitCoding = '"
-					+ departCoding + "'";
-			ResultSet rs = null;
-			try {
-				rs = objectDao.executeSql(sql);
-				DateFormat dateFormat = DateTools.YMDFORMAT.get();
-				while(rs.next()){
-					String rinserName = rs.getString("disinfectIdentification");
-					Date endDate = rs.getTimestamp("endDate");
-					String dateStr = null;
-					if(endDate != null){
-						dateStr = dateFormat.format(endDate);
+		String sql = " SELECT disinfectIdentification,endDate from WashAndDisinfectRecord wr where wr.endDate between "
+				+ dateQueryAdapter.dateConverAdapter2( startTime
+						, "yyyy-mm-dd  HH24:MI")
+				+ " and " + ""
+				+ dateQueryAdapter.dateConverAdapter2( endTime
+						, "yyyy-mm-dd  HH24:MI")
+				+ " and wr.orgUnitCoding = '"
+				+ departCoding + "'";
+		ResultSet rs = null;
+		try {
+			rs = objectDao.executeSql(sql);
+			DateFormat dateFormat = DateTools.YMDFORMAT.get();
+			while(rs.next()){
+				String rinserName = rs.getString("disinfectIdentification");
+				Date endDate = rs.getTimestamp("endDate");
+				String dateStr = null;
+				if(endDate != null){
+					dateStr = dateFormat.format(endDate);
+				}else{
+					dateStr = "";
+				}
+				String key = null;
+				key = dateStr + rinserName;
+				if(StringUtils.isNotBlank(key)){
+					RinserStove_child sc = null;
+					if(keyResultMap.containsKey(key)){
+						sc = keyResultMap.get(key);
 					}else{
-						dateStr = "";
+						sc = new RinserStove_child();
+						sc.setRinserName(rinserName);
 					}
-					String key = null;
-					key = dateStr + rinserName;
-					if(StringUtils.isNotBlank(key)){
-						RinserStove_child sc = null;
-						if(keyResultMap.containsKey(key)){
-							sc = keyResultMap.get(key);
-						}else{
-							sc = new RinserStove_child();
-							sc.setRinserName(rinserName);
-						}
-						Integer curCount = sc.getTotalWashCount();
-						sc.setTotalWashCount(curCount + 1);
-						sc.setWashTime(dateStr);
-						keyResultMap.put(key, sc);
-					}
+					Integer curCount = sc.getTotalWashCount();
+					sc.setTotalWashCount(curCount + 1);
+					sc.setWashTime(dateStr);
+					keyResultMap.put(key, sc);
 				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}finally {
-				DatabaseUtil.closeResultSetAndStatement(rs);
 			}
-		}catch(Exception ex){
-			ex.printStackTrace();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 		return Arrays.asList(keyResultMap.values().toArray());
 	}