Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
===================================================================
diff -u -r25909 -r26803
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
===================================================================
diff -u -r26375 -r26803
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
===================================================================
diff -u -r26375 -r26803
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml	(.../routineMonitoringReport.jrxml)	(revision 26375)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml	(.../routineMonitoringReport.jrxml)	(revision 26803)
@@ -75,7 +75,7 @@
 	</title>
 	<summary>
 		<band height="138" splitType="Stretch">
-			<crosstab isRepeatColumnHeaders="false">
+			<crosstab>
 				<reportElement uuid="c67f52ad-a7f8-4da3-9f11-b30f1228b1ab" x="0" y="0" width="3100" height="88"/>
 				<crosstabHeaderCell>
 					<cellContents>
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
===================================================================
diff -u -r25909 -r26803
--- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml	(.../QualityMonitoringReport.jrxml)	(revision 25909)
+++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml	(.../QualityMonitoringReport.jrxml)	(revision 26803)
@@ -96,7 +96,7 @@
 	</title>
 	<summary>
 		<band height="97" splitType="Stretch">
-			<crosstab isRepeatColumnHeaders="false" ignoreWidth="true">
+			<crosstab ignoreWidth="true">
 				<reportElement uuid="760d1e08-1e22-4dcc-872b-4c115269897e" x="0" y="0" width="7000" height="97"/>
 				<crosstabHeaderCell>
 					<cellContents style="Crosstab Data Text">
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r26761 -r26803
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 26761)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 26803)
@@ -10883,6 +10883,7 @@
 				addMonitoringItemBeanQualityMonitoring(list,sql,isCustomADJAndIsFormNameIsADJ);
 			}
 			//是否无菌包质量抽查登记表,是则隐藏监测结果列
+			Map<String, Integer> isQualifiedAmount = new HashMap<String, Integer>();
 			if (!FORMNAMEOFADJ.equals(formName) && FormDefinition.FOMRTYPE_PERIODICMONITORING.equals(monitoringType)) {
 				sql = 	" select " + dataSql + " dateStr,"
 						+ " qmd.tousseName toussName,qmd.material material,qmd.amount amount,qmi.id qmiId,qmi.positionMsg positionMsg,qmi.result "
@@ -10891,7 +10892,7 @@
 						+ " join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id "
 						+ extraJoin
 						+ " where qmi.type = '" + FormDefinition.FOMRTYPE_PERIODICMONITORING + "'" + " and " + whereSql;
-				addMonitoringItemBeanRountineMonitoring(list,sql,isCustomADJAndIsFormNameIsADJ);
+				addMonitoringItemBeanRountineMonitoring(list,sql,isCustomADJAndIsFormNameIsADJ,isQualifiedAmount);
 			}
 			// 条数
 			Integer qmCount = 0;
@@ -11084,6 +11085,7 @@
 							}
 						}
 					}
+					addQualifiedAmountInfo(isQualifiedAmount, list, orderNumber, option, questionName);
 					MonitoringItemBean bean = new MonitoringItemBean();
 					bean.setGoodsName("汇总");
 					bean.setDateTime("汇总");
@@ -11098,6 +11100,28 @@
 		}
 		return list;
 	}
+	/**
+	 * 添加合格与不合格统计信息
+	 * @param isQualifiedAmount 合格与不合格的数据
+	 * @param list List<MonitoringItemBean>
+	 * @param orderNumber 排序号
+	 * @param option 监测参数
+	 * @param questionName 监测细则名称
+	 */
+	private void addQualifiedAmountInfo(Map<String, Integer> isQualifiedAmount, List<MonitoringItemBean> list, Integer orderNumber,
+			String option, String questionName){
+		for (String key : isQualifiedAmount.keySet()) {
+			MonitoringItemBean mib = new MonitoringItemBean();
+			mib.setGoodsName("");
+			mib.setDateTime(key);
+			mib.setOrderNumber(orderNumber);
+			mib.setOption(option);
+			mib.setQuestionName(questionName);
+			mib.setAmount(isQualifiedAmount.get(key));
+			mib.setPositionMsg("");
+			list.add(mib);
+		}
+	}
 	// 获取质量监测统计项月报统计
 	@Override
 	public List getQualityMonitoringInspectMonthParamet(String queryYear,String orgUnitCoding,String monitoringType,String inspectItem,String inspectDetail,String type,String responsibilityType){
@@ -12120,12 +12144,14 @@
 	 * @param list
 	 * @param sql
 	 */
-	private void addMonitoringItemBeanRountineMonitoring(List<MonitoringItemBean> list,String sql,boolean addMonitoringItemBeanRountineMonitoring){
+	private void addMonitoringItemBeanRountineMonitoring(List<MonitoringItemBean> list,String sql,boolean addMonitoringItemBeanRountineMonitoring,Map<String, Integer> isQualifiedAmount){
 		if(StringUtils.isBlank(sql)){
 			return ;
 		}
 		ResultSet rs = objectDao.executeSql(sql);
 		try {
+			Integer qualifiedAmount = 0;
+			Integer unQualifiedAmount = 0;
 			while (rs.next()) {
 				String dataStr = rs.getString(1);
 				String tousseName = rs.getString(2);
@@ -12140,9 +12166,16 @@
 					frequency = rs.getInt("frequency");
 					sterilizerName = rs.getString("sterilizerName");
 				}
+				if("合格".equals(result)){
+					qualifiedAmount ++;
+				}else if("不合格".equals(result)){
+					unQualifiedAmount++;
+				}
 				newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
 						dataStr, 100, "-","监测结果", result, frequency, sterilizerName, addMonitoringItemBeanRountineMonitoring);
 			}
+			isQualifiedAmount.put("合格", qualifiedAmount);
+			isQualifiedAmount.put("不合格", unQualifiedAmount);
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}finally {