Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java
===================================================================
diff -u -r37116 -r37144
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java	(.../QualityMonitoringHelper.java)	(revision 37116)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java	(.../QualityMonitoringHelper.java)	(revision 37144)
@@ -620,6 +620,7 @@
 					  + recordTypeSql
 					  + "and qmi.id in ( select qmi.id from QualityMonitoringInstance qmi left join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id  where qmd.id is null) ";	
 			addMonitoringItemBeanOptionSingleResultWithoutMaterial(list,sql,showSterilizationInfo,monitoringType);
+			int qualifiedCount = 0;
 			if(queryQualified){
 				String countSql = " select count(distinct qmi.id) count from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
 						  + " join QualityMonitoringDefinition qmdf on qmdf.id=fd.id join FormInstanceItem fiItem on qmi.id=fiItem.formInstance_id join FormDefinitionItem fdi on fiItem.formDefinitionItem_id=fdi.id "
@@ -629,8 +630,8 @@
 						  + onlyQueryTousseSql
 						  + " and qmi.isQualified='是' "
 						  + "and qmi.id in ( select qmi.id from QualityMonitoringInstance qmi left join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id  where qmd.id is null) ";
-				int count = objectDao.countBySql(countSql);
-				if(count > 0){
+				qualifiedCount = objectDao.countBySql(countSql);
+				if(qualifiedCount > 0){
 					// 没有录入材料和包，单一 合格的结果 
 					sql = " select " + dataSql + " dateStr,"
 							  + " qmi.id qmiId,qmi.positionMsg positionMsg,"
@@ -646,7 +647,7 @@
 							  + "and qmi.id in ( select qmi.id from QualityMonitoringInstance qmi left join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id  where qmd.id is null) ";	
 					addMonitoringItemBeanOptionSingleResultWithoutMaterial(list,sql,showSterilizationInfo,monitoringType);	
 				}
-				requestParameters.put("qualifiedCount", count + "");
+				requestParameters.put("qualifiedCount", qualifiedCount + "");
 			}
 			if(FormDefinition.FOMRTYPE_QUALITYMONITORING.equals(monitoringType)){
 				sql = " select " + dataSql + " dateStr,"
@@ -797,6 +798,17 @@
 							bean1.setPositionMsg("");
 							list.add(bean1);
 						}
+					}else if(qualifiedCount > 0){
+						MonitoringItemBean bean1 = new MonitoringItemBean();
+						bean1.setGoodsName("合计");
+						bean1.setDateTime("合计");
+						bean1.setOrderNumber(0);
+						bean1.setOption("");
+						bean1.setQuestionName("");
+						bean1.setAmount(totalItem);
+						bean1.setAnswer("");
+						bean1.setPositionMsg("");
+						list.add(bean1);
 					}
 					Integer tousseAmoutSum = amoutSumJson.optInt("tousseAmoutSum");
 					Integer forgonAmoutSum = amoutSumJson.optInt("forgonAmoutSum");