Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r31247 -r31248
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31247)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31248)
@@ -16403,6 +16403,22 @@
 				Long qmiId = rs.getLong("qmiId");
 				if(!readedIds.contains(qmiId)){
 					readedIds.add(qmiId);
+					if(lastMonitoringItemBean != null){
+						newMonitoringItem(list, lastMonitoringItemBean.getAmount(),
+								lastMonitoringItemBean.getTousseName(),
+								lastMonitoringItemBean.getMaterialName(),
+								lastMonitoringItemBean.getQualityMonitoringInstanceId(),
+								lastMonitoringItemBean.getPositionMsg(),
+								lastMonitoringItemBean.getDateTime(),
+								lastMonitoringItemBean.getOrderNumber(),
+								lastMonitoringItemBean.getQuestionName(),
+								lastMonitoringItemBean.getOption(), 
+								lastMonitoringItemBean.getAnswer(),
+								lastMonitoringItemBean.getFrequency(),
+								lastMonitoringItemBean.getSterilizerName(),isCustomADJAndIsFormNameIsADJ,
+								lastMonitoringItemBean.getCreateUserName(), 
+								lastMonitoringItemBean.getQualityMonitoringGoodsId());
+					}
 					lastMonitoringItemBean = null;
 				}
 				int amount = rs.getInt("amount");
@@ -16448,7 +16464,6 @@
 									lastMonitoringItemBean.getCreateUserName(), 
 									lastMonitoringItemBean.getQualityMonitoringGoodsId());
 							lastMonitoringItemBean = null;
-							continue;
 						}
 						lastMonitoringItemBean = new MonitoringItemBean(); 
 						lastMonitoringItemBean.setAmount(amount);
@@ -16479,6 +16494,22 @@
 				newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
 						dataStr, orderNum, questionName,optionStr, answer,frequency,sterilizerName,isCustomADJAndIsFormNameIsADJ,createUserName, qmdid);
 			}
+			if(lastMonitoringItemBean != null){
+				newMonitoringItem(list, lastMonitoringItemBean.getAmount(),
+						lastMonitoringItemBean.getTousseName(),
+						lastMonitoringItemBean.getMaterialName(),
+						lastMonitoringItemBean.getQualityMonitoringInstanceId(),
+						lastMonitoringItemBean.getPositionMsg(),
+						lastMonitoringItemBean.getDateTime(),
+						lastMonitoringItemBean.getOrderNumber(),
+						lastMonitoringItemBean.getQuestionName(),
+						lastMonitoringItemBean.getOption(), 
+						lastMonitoringItemBean.getAnswer(),
+						lastMonitoringItemBean.getFrequency(),
+						lastMonitoringItemBean.getSterilizerName(),isCustomADJAndIsFormNameIsADJ,
+						lastMonitoringItemBean.getCreateUserName(), 
+						lastMonitoringItemBean.getQualityMonitoringGoodsId());
+			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}finally {
@@ -16829,6 +16860,22 @@
 				Long qmiId = rs.getLong(5);
 				if(!readedIds.contains(qmiId)){
 					readedIds.add(qmiId);
+					if(lastMonitoringItemBean != null){
+						newMonitoringItem(list, lastMonitoringItemBean.getAmount(),
+								lastMonitoringItemBean.getTousseName(),
+								lastMonitoringItemBean.getMaterialName(),
+								lastMonitoringItemBean.getQualityMonitoringInstanceId(),
+								lastMonitoringItemBean.getPositionMsg(),
+								lastMonitoringItemBean.getDateTime(),
+								lastMonitoringItemBean.getOrderNumber(),
+								lastMonitoringItemBean.getQuestionName(),
+								"-", 
+								lastMonitoringItemBean.getAnswer(),
+								lastMonitoringItemBean.getFrequency(),
+								lastMonitoringItemBean.getSterilizerName(),addMonitoringItemBeanOptionSingleResult,
+								lastMonitoringItemBean.getCreateUserName(), 
+								lastMonitoringItemBean.getQualityMonitoringGoodsId());
+					}
 					lastMonitoringItemBean = null;
 				}
 				int amount = rs.getInt(4);
@@ -16871,8 +16918,7 @@
 									lastMonitoringItemBean.getFrequency(),
 									lastMonitoringItemBean.getSterilizerName(),addMonitoringItemBeanOptionSingleResult,
 									lastMonitoringItemBean.getCreateUserName(),lastMonitoringItemBean.getQualityMonitoringGoodsId());
-							lastMonitoringItemBean = null;
-							continue;
+							lastMonitoringItemBean = null; 
 						}
 						lastMonitoringItemBean = new MonitoringItemBean(); 
 						lastMonitoringItemBean.setAmount(amount);
@@ -16902,6 +16948,22 @@
 				newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
 						dataStr, orderNum, "-",questionName, answer, frequency, sterilizerName, addMonitoringItemBeanOptionSingleResult,createUserName, qmdid);
 			}
+			if(lastMonitoringItemBean != null){
+				newMonitoringItem(list, lastMonitoringItemBean.getAmount(),
+						lastMonitoringItemBean.getTousseName(),
+						lastMonitoringItemBean.getMaterialName(),
+						lastMonitoringItemBean.getQualityMonitoringInstanceId(),
+						lastMonitoringItemBean.getPositionMsg(),
+						lastMonitoringItemBean.getDateTime(),
+						lastMonitoringItemBean.getOrderNumber(),
+						lastMonitoringItemBean.getQuestionName(),
+						"-", 
+						lastMonitoringItemBean.getAnswer(),
+						lastMonitoringItemBean.getFrequency(),
+						lastMonitoringItemBean.getSterilizerName(),addMonitoringItemBeanOptionSingleResult,
+						lastMonitoringItemBean.getCreateUserName(), 
+						lastMonitoringItemBean.getQualityMonitoringGoodsId());
+			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}finally {