Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35244 -r35246
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35244)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35246)
@@ -18930,82 +18930,83 @@
 			Integer forgonAmoutSum = 0;
 			rs = objectDao.executeSql(sql);
 			Map<Long, MonitoringItemBean> monitoringItemBeanMap = null;
+			List<MonitoringItemBean> addList = new ArrayList<MonitoringItemBean>();//本次要新增的bean
 			while (rs.next()) {
-				MonitoringItemBean monitoringItemBean = null;
 				Long qmiId = rs.getLong("qmiId");
-				for (MonitoringItemBean bean : list) {
-					if(MathTools.equals(bean.getQualityMonitoringInstanceId(), qmiId)){
-						monitoringItemBean = bean;
-						break;
+				for (MonitoringItemBean monitoringItemBean : list) {
+					if(monitoringItemBean == null){
+						continue;
 					}
-				}
-				if(monitoringItemBean == null){
-					continue;
-				}
-				String dataStr = rs.getString("dateStr");
-				String recordRecycleInformation = rs.getString("recordRecycleInformation");
-				String recordRinseInformation = rs.getString("recordRinseInformation");
-				String recordSterilizatioInformation = rs.getString("recordSterilizatioInformation");
-				if(SqlUtils.isExistColumn(rs, "sterilizationStartDate") && Constants.STR_YES.equals(recordSterilizatioInformation)){
-					String name = rs.getString("name");
-					if(StringUtils.isNotBlank(name)){
-						Integer steFrequency = ConvertNumber.getNumberIntValue(rs.getObject("frequency"), null);
-						name = name + ",第" + steFrequency + "炉";
-					}
-					if(StringUtils.isBlank(name)){
-						name = "";
-					}
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean, 10, "灭菌情况", "灭菌批号",name, isCustomADJAndIsFormNameIsADJ);
-					String sterilizationUser = rs.getString("sterilizationUser");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean, 10,"灭菌情况","灭菌员", sterilizationUser, isCustomADJAndIsFormNameIsADJ);
-					String startDate = rs.getString("sterilizationStartDate");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean, 10, "灭菌情况","灭菌时间", startDate, isCustomADJAndIsFormNameIsADJ);
-					Integer steAmount = rs.getInt("steAmount");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean, 10, "灭菌情况","当次炉次灭菌总包数", steAmount + "", isCustomADJAndIsFormNameIsADJ);
-				}else if(SqlUtils.isExistColumn(rs, "washStartDate") && Constants.STR_YES.equals(recordRinseInformation)){
-					String startDate = null;
-					String disinfectIdentification = null;
-					disinfectIdentification = rs.getString("disinfectIdentification");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "清洗情况","清洗机", disinfectIdentification, isCustomADJAndIsFormNameIsADJ);
-					startDate = rs.getString("washStartDate");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "清洗情况","清洗开始时间", startDate, isCustomADJAndIsFormNameIsADJ);
-					Integer forgonAmount = 0;
-					Integer totalAmout = 0;
-					if(MapUtils.isNotEmpty(washAmountMap)){
-						Map<String, Integer> washAmountMapItem = washAmountMap.get(dataStr);
-						if(MapUtils.isNotEmpty(washAmountMapItem)){
-							if(washAmountMapItem.containsKey("外来器械")){
-								forgonAmount = washAmountMapItem.get("外来器械");
+					if(MathTools.equals(monitoringItemBean.getQualityMonitoringInstanceId(), qmiId)){
+						String dataStr = rs.getString("dateStr");
+						String recordRecycleInformation = rs.getString("recordRecycleInformation");
+						String recordRinseInformation = rs.getString("recordRinseInformation");
+						String recordSterilizatioInformation = rs.getString("recordSterilizatioInformation");
+						if(SqlUtils.isExistColumn(rs, "sterilizationStartDate") && Constants.STR_YES.equals(recordSterilizatioInformation)){
+							String name = rs.getString("name");
+							if(StringUtils.isNotBlank(name)){
+								Integer steFrequency = ConvertNumber.getNumberIntValue(rs.getObject("frequency"), null);
+								name = name + ",第" + steFrequency + "炉";
 							}
-							totalAmout = washAmountMapItem.get("清洗总数");
-							totalAmout = totalAmout - forgonAmount;
+							if(StringUtils.isBlank(name)){
+								name = "";
+							}
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 10, "灭菌情况", "灭菌批号",name, isCustomADJAndIsFormNameIsADJ);
+							String sterilizationUser = rs.getString("sterilizationUser");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 10,"灭菌情况","灭菌员", sterilizationUser, isCustomADJAndIsFormNameIsADJ);
+							String startDate = rs.getString("sterilizationStartDate");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 10, "灭菌情况","灭菌时间", startDate, isCustomADJAndIsFormNameIsADJ);
+							Integer steAmount = rs.getInt("steAmount");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 10, "灭菌情况","当次炉次灭菌总包数", steAmount + "", isCustomADJAndIsFormNameIsADJ);
+						}else if(SqlUtils.isExistColumn(rs, "washStartDate") && Constants.STR_YES.equals(recordRinseInformation)){
+							String startDate = null;
+							String disinfectIdentification = null;
+							disinfectIdentification = rs.getString("disinfectIdentification");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 15, "清洗情况","清洗机", disinfectIdentification, isCustomADJAndIsFormNameIsADJ);
+							startDate = rs.getString("washStartDate");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 15, "清洗情况","清洗开始时间", startDate, isCustomADJAndIsFormNameIsADJ);
+							Integer forgonAmount = 0;
+							Integer totalAmout = 0;
+							if(MapUtils.isNotEmpty(washAmountMap)){
+								Map<String, Integer> washAmountMapItem = washAmountMap.get(dataStr);
+								if(MapUtils.isNotEmpty(washAmountMapItem)){
+									if(washAmountMapItem.containsKey("外来器械")){
+										forgonAmount = washAmountMapItem.get("外来器械");
+									}
+									totalAmout = washAmountMapItem.get("清洗总数");
+									totalAmout = totalAmout - forgonAmount;
+								}
+							}
+							String washPersonInCharge = null;
+							if(SqlUtils.isExistColumn(rs, "washPersonInCharge")){
+								washPersonInCharge = rs.getString("washPersonInCharge");
+								copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 15, "清洗情况","责任人", washPersonInCharge, isCustomADJAndIsFormNameIsADJ);
+							}
+							if(!readedSet.contains(dataStr)){
+								readedSet.add(dataStr);
+								tousseAmoutSum += totalAmout;
+								forgonAmoutSum += forgonAmount;
+								copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 15, "清洗情况","当天清洗件数", totalAmout + "", isCustomADJAndIsFormNameIsADJ);
+								copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 15, "清洗情况","当天清洗外来器械件数", forgonAmount + "", isCustomADJAndIsFormNameIsADJ);
+							}
+						}else if(SqlUtils.isExistColumn(rs, "recyclingTime") && Constants.STR_YES.equals(recordRecycleInformation)){
+							String depart = rs.getString("depart");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 15, "回收情况","回收科室", depart, isCustomADJAndIsFormNameIsADJ);
+							String operationRoom = rs.getString("operationRoom");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean,15, "回收情况","手术间", operationRoom, isCustomADJAndIsFormNameIsADJ);
+							String circuitNurse = rs.getString("circuitNurse");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean,  15, "回收情况","巡回护士", circuitNurse, isCustomADJAndIsFormNameIsADJ);
+							String recyclingUser = rs.getString("recyclingUser");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean,15, "回收情况","回收员", recyclingUser, isCustomADJAndIsFormNameIsADJ);
+							String recyclingTime = rs.getString("recyclingTime");
+							copyPartPropertiesMonitoringItem(addList, monitoringItemBean, 15, "回收情况","回收时间", recyclingTime, isCustomADJAndIsFormNameIsADJ);
 						}
 					}
-					String washPersonInCharge = null;
-					if(SqlUtils.isExistColumn(rs, "washPersonInCharge")){
-						washPersonInCharge = rs.getString("washPersonInCharge");
-						copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "清洗情况","责任人", washPersonInCharge, isCustomADJAndIsFormNameIsADJ);
-					}
-					if(!readedSet.contains(dataStr)){
-						readedSet.add(dataStr);
-						tousseAmoutSum += totalAmout;
-						forgonAmoutSum += forgonAmount;
-						copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "清洗情况","当天清洗件数", totalAmout + "", isCustomADJAndIsFormNameIsADJ);
-						copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "清洗情况","当天清洗外来器械件数", forgonAmount + "", isCustomADJAndIsFormNameIsADJ);
-					}
-				}else if(SqlUtils.isExistColumn(rs, "recyclingTime") && Constants.STR_YES.equals(recordRecycleInformation)){
-					String depart = rs.getString("depart");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "回收情况","回收科室", depart, isCustomADJAndIsFormNameIsADJ);
-					String operationRoom = rs.getString("operationRoom");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean,15, "回收情况","手术间", operationRoom, isCustomADJAndIsFormNameIsADJ);
-					String circuitNurse = rs.getString("circuitNurse");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean,  15, "回收情况","巡回护士", circuitNurse, isCustomADJAndIsFormNameIsADJ);
-					String recyclingUser = rs.getString("recyclingUser");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean,15, "回收情况","回收员", recyclingUser, isCustomADJAndIsFormNameIsADJ);
-					String recyclingTime = rs.getString("recyclingTime");
-					copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "回收情况","回收时间", recyclingTime, isCustomADJAndIsFormNameIsADJ);
 				}
 			}
+			if(addList.size() > 0){
+				list.addAll(addList);
+			}
 			amoutSumJson.put("tousseAmoutSum", tousseAmoutSum);
 			amoutSumJson.put("forgonAmoutSum", forgonAmoutSum);
 		} catch (SQLException e) {