Index: ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml
===================================================================
diff -u -r27617 -r27743
--- ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml	(.../sterilizationRecordReport.jrxml)	(revision 27617)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml	(.../sterilizationRecordReport.jrxml)	(revision 27743)
@@ -27,7 +27,7 @@
 	<parameter name="title" class="java.lang.String"/>
 	<parameter name="createDate" class="java.lang.String"/>
 	<field name="sterilizerName" class="java.lang.String"/>
-	<field name="frequency" class="java.lang.Integer"/>
+	<field name="frequency" class="java.lang.String"/>
 	<field name="tousseName" class="java.lang.String"/>
 	<field name="tousseSpecification" class="java.lang.String"/>
 	<field name="tousseAmount" class="java.lang.Integer"/>
Index: forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
===================================================================
diff -u -r26863 -r27743
--- forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java	(.../SqlUtils.java)	(revision 26863)
+++ forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java	(.../SqlUtils.java)	(revision 27743)
@@ -425,7 +425,7 @@
 	 * @param columnName 列名 
 	 * @return true 存在; false 不存咋 
 	 */  
-	public boolean isExistColumn(ResultSet rs, String columnName) {  
+	public static boolean isExistColumn(ResultSet rs, String columnName) {  
 	    try {  
 	        if (rs.findColumn(columnName) > 0 ) {  
 	            return true;  
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
===================================================================
diff -u -r27651 -r27743
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
===================================================================
diff -u -r27651 -r27743
--- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml	(.../QualityMonitoringReport.jrxml)	(revision 27651)
+++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml	(.../QualityMonitoringReport.jrxml)	(revision 27743)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="QualityMonitoringReport" language="groovy" pageWidth="7000" pageHeight="1083" columnWidth="7000" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="7a1b4557-a774-4276-982f-6340b58433e3">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="675"/>
+	<property name="ireport.x" value="10"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Crosstab Data Text" hAlign="Center"/>
 	<style name="table">
@@ -67,9 +67,6 @@
 	<field name="id" class="java.lang.Long">
 		<fieldDescription><![CDATA[id]]></fieldDescription>
 	</field>
-	<field name="option" class="java.lang.String">
-		<fieldDescription><![CDATA[option]]></fieldDescription>
-	</field>
 	<field name="orderNumber" class="java.lang.Integer">
 		<fieldDescription><![CDATA[orderNumber]]></fieldDescription>
 	</field>
@@ -168,8 +165,8 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField pattern="">
-								<reportElement uuid="4e9dd109-2026-415f-bd8d-c5d6a949c819" style="table_TD" x="0" y="0" width="177" height="25"/>
+							<textField isStretchWithOverflow="true" pattern="">
+								<reportElement uuid="4e9dd109-2026-415f-bd8d-c5d6a949c819" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="177" height="25"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -187,8 +184,8 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField>
-								<reportElement uuid="5629cbcc-abb4-47fb-8696-733472b5f0d9" style="table_TD" x="0" y="0" width="55" height="25"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="5629cbcc-abb4-47fb-8696-733472b5f0d9" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="55" height="25"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -206,8 +203,8 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField>
-								<reportElement uuid="2ab1ad2b-9de1-4602-b3db-209ac2706932" style="table_TD" x="0" y="0" width="170" height="25"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="2ab1ad2b-9de1-4602-b3db-209ac2706932" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="170" height="25"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -225,8 +222,8 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField isBlankWhenNull="true">
-								<reportElement uuid="84c426f6-a8ed-4859-8418-a872216b72ef" style="table_TD" mode="Opaque" x="0" y="0" width="100" height="25"/>
+							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+								<reportElement uuid="84c426f6-a8ed-4859-8418-a872216b72ef" style="table_TD" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="100" height="25"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -253,7 +250,7 @@
 						<cellContents/>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<columnGroup name="questionName" height="42" headerPosition="Stretch">
+				<columnGroup name="questionName" height="83" headerPosition="Stretch">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{questionName}]]></bucketExpression>
 					</bucket>
@@ -263,7 +260,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-								<reportElement uuid="34e1ddb9-9d19-406a-8a3d-2218db8002cd" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="56" height="42" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
+								<reportElement uuid="34e1ddb9-9d19-406a-8a3d-2218db8002cd" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="161" height="83" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 									<paragraph tabStopWidth="40"/>
@@ -276,36 +273,16 @@
 						<cellContents/>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<columnGroup name="option" height="41" headerPosition="Stretch">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{option}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents>
-							<textField pattern="" isBlankWhenNull="true">
-								<reportElement uuid="7ec92dc6-d92d-4bf5-82aa-0aac3fb95ebb" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="56" height="41"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true" isUnderline="false" isStrikeThrough="false"/>
-									<paragraph lineSpacing="Single"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{option}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents/>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
 				<measure name="answerMeasure" class="java.lang.String" calculation="First">
 					<measureExpression><![CDATA[$F{answer}]]></measureExpression>
 				</measure>
-				<crosstabCell width="56" height="25">
+				<crosstabCell width="161" height="25">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField isBlankWhenNull="true">
-							<reportElement uuid="0040ed3b-81c5-4886-881d-1d8f4a7b237d" style="table_TD" x="0" y="0" width="56" height="25"/>
+						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+							<reportElement uuid="0040ed3b-81c5-4886-881d-1d8f4a7b237d" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="161" height="25"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
@@ -391,18 +368,6 @@
 				<crosstabCell rowTotalGroup="amount" columnTotalGroup="questionName">
 					<cellContents/>
 				</crosstabCell>
-				<crosstabCell columnTotalGroup="option">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="dateTime" columnTotalGroup="option">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="tousseName" columnTotalGroup="option">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="amount" columnTotalGroup="option">
-					<cellContents/>
-				</crosstabCell>
 				<crosstabCell rowTotalGroup="positionMsg">
 					<cellContents/>
 				</crosstabCell>
@@ -412,9 +377,6 @@
 				<crosstabCell rowTotalGroup="positionMsg" columnTotalGroup="questionName">
 					<cellContents/>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="positionMsg" columnTotalGroup="option">
-					<cellContents/>
-				</crosstabCell>
 				<crosstabCell rowTotalGroup="createUserName">
 					<cellContents/>
 				</crosstabCell>
@@ -424,9 +386,6 @@
 				<crosstabCell rowTotalGroup="createUserName" columnTotalGroup="questionName">
 					<cellContents/>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="createUserName" columnTotalGroup="option">
-					<cellContents/>
-				</crosstabCell>
 			</crosstab>
 		</band>
 	</summary>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r27687 -r27743
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27687)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27743)
@@ -3082,35 +3082,31 @@
 				while (rs.next()) {
 					SterilizationRecordItenBean bean = new SterilizationRecordItenBean();
 					// 从数据库里面查出来的数据依次是：灭菌炉、炉次、器械包名称、发货科室、灭菌时间、灭菌员、数量
-					String str = rs.getString(1);
+					String str = rs.getString("sterilizerName");
 					if(StringUtils.isNotBlank(str)){
 						bean.setSterilizerName(str);
 					}
-					str = rs.getString(2);
+					str = rs.getString("sterileFrequency");
 					if(StringUtils.isNotBlank(str)){
-						try{
-							bean.setFrequency(Integer.valueOf(str));
-						}catch(Exception e){
-							e.printStackTrace();
-						}
+						bean.setFrequency(str);
 					}
-					str = rs.getString(3);
+					str = rs.getString("tousseName");
 					if(StringUtils.isNotBlank(str)){
 						bean.setTousseName(str);
 					}
-					str = rs.getString(4);
+					str = rs.getString("locationForDisplay");
 					if(StringUtils.isNotBlank(str)){
 						bean.setSendDepart(str);
 					}
-					str = rs.getString(5);
+					str = rs.getString("sterileEndTime");
 					if(StringUtils.isNotBlank(str)){
 						bean.setSterilizationFinishTime(str);
 					}
-					str = rs.getString(6);
+					str = rs.getString("sterilizationUser");
 					if(StringUtils.isNotBlank(str)){
 						bean.setSterilizationUser(str);
 					}
-					bean.setTousseAmount(rs.getInt(7));
+					bean.setTousseAmount(rs.getInt("amount"));
 					list.add(bean);
 				}
 			} catch (Exception e) {
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27695 -r27743
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27695)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27743)
@@ -47,6 +47,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.log4j.Logger;
+import org.jsoup.helper.DataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -8901,28 +8902,98 @@
 		if(beanList == null){
 			return ;
 		}
+		ReportQueryParams params = new ReportQueryParams();
+		String sql = getWashWorkloadSql(params, statDate, endDate, querySupplyRoom, dataSoureOfMaterialsCountOfToussesInReports, false);
+
+		Map<String,Integer> amountMap = getWashWorkloadAmountMap(sql);
+		// 清洗不合格数量
+		String unQualitySql = DataIndex.getQMAmountSqlByFormNames(new String[]{"清洗不合格","清洗不及格"}, params, true);
+		
+		Integer unQualityAmount = dataIndex.getAmountBySql(unQualitySql);
+		
+		CrossTableBean ctBean = getCrossTableBean("普通器械",titleColumnNumMap,statDate,amountMap.get("普通器械"),null);
+		if(ctBean != null){
+			beanList.add(ctBean);
+		}
+		CrossTableBean ctBean1 = getCrossTableBean("手术器械",titleColumnNumMap,statDate,amountMap.get("手术器械"),null);
+		if(ctBean1 != null){
+			beanList.add(ctBean1);
+		}
+		CrossTableBean ctBean2 = getCrossTableBean("外来器械",titleColumnNumMap,statDate,amountMap.get("外来器械"),null);
+		if(ctBean2 != null){
+			beanList.add(ctBean2);
+		}
+		CrossTableBean ctBean3 = getCrossTableBean("消毒物品",titleColumnNumMap,statDate,amountMap.get("消毒物品"),null);
+		if(ctBean3 != null){
+			beanList.add(ctBean3);
+		}
+		CrossTableBean ctBean4 = getCrossTableBean("外来器械二次清洗",titleColumnNumMap,statDate,amountMap.get("外来器械二次清洗"),null);
+		if(ctBean4 != null){
+			beanList.add(ctBean4);
+		}
+		CrossTableBean ctBean5 = getCrossTableBean("清洗总数",titleColumnNumMap,statDate,amountMap.get("清洗总数"),null);
+		if(ctBean5 != null){
+			beanList.add(ctBean5);
+		}
+		CrossTableBean ctBean6 = getCrossTableBean("不合格数",titleColumnNumMap,statDate,unQualityAmount,null);
+		if(ctBean6 != null){
+			beanList.add(ctBean6);
+		}
+		
+		String rate = "0.0%";
+		if(unQualityAmount > 0 && amountMap.get("清洗总数") > 0){
+			rate = MathTools.divideStr(unQualityAmount, amountMap.get("清洗总数"), 2);
+		}
+		CrossTableBean ctBean7 = getCrossTableBean("不合格率",titleColumnNumMap,statDate,0,rate);
+		if(ctBean7 != null){
+			beanList.add(ctBean7);
+		}
+	}
+	/**
+	 * 获取清洗记录加载的sql 
+	 * @param params
+	 * @param statDate 开始时间
+	 * @param endDate 结束时间
+	 * @param querySupplyRoom 科室编码
+	 * @param dataSoureOfMaterialsCountOfToussesInReports 报表材料数量显示方式
+	 * @return
+	 */
+	private String getWashWorkloadSql(ReportQueryParams params, String statDate, String endDate, String querySupplyRoom, Integer dataSoureOfMaterialsCountOfToussesInReports, boolean groupByDay){
 		String betweenSql = String.format(" between %s and %s ",
 				dateQueryAdapter.dateConverAdapter2(statDate, "yyyy-mm-dd"),
 				dateQueryAdapter.dateConverAdapter2(endDate, "yyyy-mm-dd"));
-		
-		ReportQueryParams params = new ReportQueryParams();
 		params.betweenSql = betweenSql;
 		params.querySupplyRoom = querySupplyRoom;
-
+		String groupByDaySql = null;
+		String queryDaySql = null;
+		String endDaySql = null;
+		if(groupByDay){
+			groupByDaySql = "," + dateQueryAdapter.dateToVarchar1("wr.endDate");
+			queryDaySql = groupByDaySql + " endDate ";
+			endDaySql = ",rs.endDate ";
+		}else{
+			groupByDaySql = "";
+			queryDaySql = "";
+			endDaySql = "";
+		}
 		// 统计清洗项的itemType为材料的物品，包括拆包清洗的器械包以及外来器械包
 		String sql = String
 				.format("select ci.itemType type,ci.orgUnitName,ci.isSencondWashForForeignTousse ,sum(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end) amount, td.tousseType "
+						+ queryDaySql
 						+ dataIndex.getWashMaterialAmountSqlFromItemTypeIsMaterial(params.extraJoinCondition)
-						+ " and wr.endDate %s and wr.washMaterialAmount <> 0 %s group by ci.itemType,ci.orgUnitName,ci.isSencondWashForForeignTousse, td.tousseType ",
+						+ " and wr.endDate %s and wr.washMaterialAmount <> 0 %s group by ci.itemType,ci.orgUnitName,ci.isSencondWashForForeignTousse, td.tousseType "
+						+ groupByDaySql,
 						params.betweenSql,
 						SqlUtils.get_InSql_Extra("wr.orgUnitCoding", params.querySupplyRoom));
 		
 		// 统计清洗项的itemType为材料的物品，单独入清洗篮筐的器械，没有关联的器械包
 		sql += " union all ";
 		sql += String
 				.format("select ci.itemType type,ci.orgUnitName,ci.isSencondWashForForeignTousse ,sum(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end) amount, td.tousseType "
+						+ queryDaySql
 						+ dataIndex.getWashMaterialAmountSqlFromItemTypeIsMaterialWithoutTousseDefinition(params.extraJoinCondition)
-						+ " and wr.endDate %s and wr.washMaterialAmount <> 0 %s group by ci.itemType,ci.orgUnitName,ci.isSencondWashForForeignTousse, td.tousseType ",
+						+ " and wr.endDate %s and wr.washMaterialAmount <> 0 %s group by ci.itemType,ci.orgUnitName,ci.isSencondWashForForeignTousse, td.tousseType "
+						+ groupByDaySql,
 						params.betweenSql,
 						SqlUtils.get_InSql_Extra("wr.orgUnitCoding", params.querySupplyRoom));
 		
@@ -8940,8 +9011,10 @@
 		}
 		sql += String
 				.format("select ci.itemType type,ci.orgUnitName,ci.isSencondWashForForeignTousse ,sum(%s) amount, td.tousseType "
+						+ queryDaySql
 						+ dataIndex.getWashMaterialAmountSqlFromItemTypeIsNotMaterial(joinMaterialInstanceSql)
-						+ " and wr.endDate %s and wr.washMaterialAmount <> 0 %s group by ci.itemType,ci.orgUnitName,ci.isSencondWashForForeignTousse, td.tousseType ",
+						+ " and wr.endDate %s and wr.washMaterialAmount <> 0 %s group by ci.itemType,ci.orgUnitName,ci.isSencondWashForForeignTousse, td.tousseType "
+						+ groupByDaySql,
 						columnSql,
 						params.betweenSql,
 						SqlUtils.get_InSql_Extra("wr.orgUnitCoding", params.querySupplyRoom));
@@ -8951,61 +9024,25 @@
 		sql += " union all ";
 		sql += String
 				.format("select md.type,org.name orgUnitName,0 isSencondWashForForeignTousse ,sum(wrm.amount) amount,'' tousseType "
+						+ queryDaySql
 						+ "from WashAndDisinfectRecord wr, WashRecord_WashMaterial wm,WashAndDisinfectRecordMaterial wrm,MaterialDefinition md, OrgUnit org "
 						+ "where wm.WashAndDisinfectRecord_ID = wr.id and wrm.id = wm.WashAndDisinfectMaterial_ID and wrm.materialDefinition_id = md.id and org.orgUnitCoding = wr.orgUnitCoding "
-						+ " and wr.endDate %s %s group by md.type,org.name",
+						+ " and wr.endDate %s %s group by md.type,org.name"
+						+ groupByDaySql,
 						params.betweenSql, SqlUtils.get_InSql_Extra(
 								"wr.orgUnitCoding", params.querySupplyRoom));
-		sql = " select rs.type,rs.orgUnitName,rs.isSencondWashForForeignTousse,sum(rs.amount), rs.tousseType from ("
+		sql = " select rs.type,rs.orgUnitName,rs.isSencondWashForForeignTousse,sum(rs.amount) amount, rs.tousseType "+ endDaySql + " from ("
 				+ sql
 				+ ")rs "
-				+ " group by rs.type,rs.orgUnitName,rs.isSencondWashForForeignTousse,rs.tousseType";
-
-		Map<String,Integer> amountMap = getWashWorkloadAmountMap(sql);
-		// 清洗不合格数量
-		String unQualitySql = DataIndex.getQMAmountSqlByFormNames(new String[]{"清洗不合格","清洗不及格"}, params, true);
-		
-		Integer unQualityAmount = dataIndex.getAmountBySql(unQualitySql);
-		
-		CrossTableBean ctBean = getCrossTableBean("普通器械",titleColumnNumMap,statDate,amountMap.get("普通器械"),null);
-		if(ctBean != null){
-			beanList.add(ctBean);
-		}
-		CrossTableBean ctBean1 = getCrossTableBean("手术器械",titleColumnNumMap,statDate,amountMap.get("手术器械"),null);
-		if(ctBean1 != null){
-			beanList.add(ctBean1);
-		}
-		CrossTableBean ctBean2 = getCrossTableBean("外来器械",titleColumnNumMap,statDate,amountMap.get("外来器械"),null);
-		if(ctBean2 != null){
-			beanList.add(ctBean2);
-		}
-		CrossTableBean ctBean3 = getCrossTableBean("消毒物品",titleColumnNumMap,statDate,amountMap.get("消毒物品"),null);
-		if(ctBean3 != null){
-			beanList.add(ctBean3);
-		}
-		CrossTableBean ctBean4 = getCrossTableBean("外来器械二次清洗",titleColumnNumMap,statDate,amountMap.get("外来器械二次清洗"),null);
-		if(ctBean4 != null){
-			beanList.add(ctBean4);
-		}
-		CrossTableBean ctBean5 = getCrossTableBean("清洗总数",titleColumnNumMap,statDate,amountMap.get("清洗总数"),null);
-		if(ctBean5 != null){
-			beanList.add(ctBean5);
-		}
-		CrossTableBean ctBean6 = getCrossTableBean("不合格数",titleColumnNumMap,statDate,unQualityAmount,null);
-		if(ctBean6 != null){
-			beanList.add(ctBean6);
-		}
-		
-		String rate = "0.0%";
-		if(unQualityAmount > 0 && amountMap.get("清洗总数") > 0){
-			rate = MathTools.divideStr(unQualityAmount, amountMap.get("清洗总数"), 2);
-		}
-		CrossTableBean ctBean7 = getCrossTableBean("不合格率",titleColumnNumMap,statDate,0,rate);
-		if(ctBean7 != null){
-			beanList.add(ctBean7);
-		}
+				+ " group by rs.type,rs.orgUnitName,rs.isSencondWashForForeignTousse,rs.tousseType" + endDaySql;
+		return sql;
 	}
-	private Map<String,Integer> getWashWorkloadAmountMap(String sql){
+	/**
+	 * 获取清洗数据
+	 * @param sql
+	 * @return
+	 */
+	public Map<String,Integer> getWashWorkloadAmountMap(String sql){
 		Map<String,Integer> map = new HashMap<String ,Integer>();
 		// 手术器械设置
 		GoodsOption option = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_SURGICALINSTRUMENTS_DEPT, null);
@@ -9014,10 +9051,10 @@
 		ResultSet rs = objectDao.executeSql(sql);
 		try {
 			while(rs.next()){
-				String type = rs.getString(1);
-				String orgUnitName = rs.getString(2);
-				boolean isSecWashForeignTousse = rs.getBoolean(3);
-				Integer amount = rs.getInt(4);
+				String type = rs.getString("type");
+				String orgUnitName = rs.getString("orgUnitName");
+				boolean isSecWashForeignTousse = rs.getBoolean("isSencondWashForForeignTousse");
+				Integer amount = rs.getInt("amount");
 				String tousseType = rs.getString("tousseType");
 				String key = "";
 				if(ClassifiedItem.TYPE_FOREIGN_TOUSSE.equals(tousseType)){
@@ -9059,6 +9096,73 @@
 		return map;
 	}
 	/**
+	 * 获取清洗数据 按日期分组查询和计算
+	 * @param sql
+	 * @return
+	 */
+	public Map<String, Map<String,Integer>> getWashWorkloadAmountMap(String sql, boolean groupByDate){
+		// 手术器械设置
+		GoodsOption option = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_SURGICALINSTRUMENTS_DEPT, null);
+		List<String> groupDeparts = httpOptionManager.getDepartsFromDepartGroup();
+		Integer totalAmount = 0;
+		ResultSet rs = null;
+		Map<String, Map<String,Integer>> washAmountMap = new HashMap<String, Map<String,Integer>>();
+		try {
+			rs = objectDao.executeSql(sql);
+			while(rs.next()){
+				String type = rs.getString("type");
+				String orgUnitName = rs.getString("orgUnitName");
+				boolean isSecWashForeignTousse = rs.getBoolean("isSencondWashForForeignTousse");
+				Integer amount = rs.getInt("amount");
+				String tousseType = rs.getString("tousseType");
+				String endDate = rs.getString("endDate");
+				String key = "";
+				if(ClassifiedItem.TYPE_FOREIGN_TOUSSE.equals(tousseType)){
+					// 外来器械包，看是否二次清洗
+					if(isSecWashForeignTousse == false){
+						key = "外来器械";
+					}else{
+						key = "外来器械二次清洗";
+					}
+				}else if(ClassifiedItem.TYPE_DISINFECTION_GOODS.equals(type)){
+					key = "消毒物品";
+					
+				}else{
+					// 不是外来器械，不是消毒物品，就是手术器械，或者普通器械，或者分组器械
+					// 是手术器械
+					if (StringUtils.isNotBlank(orgUnitName) && option != null && StringUtils.isNotBlank(option.getValue()) && option.getValue().indexOf(orgUnitName) != -1) {
+						key = "手术器械";
+					}else if( !(CollectionUtils.isNotEmpty(groupDeparts) && groupDeparts.contains(orgUnitName)) ){
+						// 也不是分组器械，是普通器械
+						key = "普通器械";
+					}
+				}
+				if(StringUtils.isNotBlank(endDate) && StringUtils.isNotBlank(key)){
+					Map<String,Integer> mapItem = null;
+					if(washAmountMap.containsKey(endDate)){
+						mapItem = washAmountMap.get(endDate);
+					}else{
+						mapItem = new HashMap<String, Integer>();
+						mapItem.put("清洗总数", 0);
+						washAmountMap.put(endDate, mapItem);
+					}
+					if(mapItem.containsKey(key)){
+						Integer curAmount = mapItem.get(key);
+						mapItem.put(key, curAmount + amount);
+					}else{
+						mapItem.put(key,amount);
+					}
+					mapItem.put("清洗总数", mapItem.get("清洗总数") + amount);
+				}
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return washAmountMap;
+	}
+	/**
 	 * 获取交叉报表的bean
 	 * @param title
 	 * @param titleColunmMap
@@ -13042,6 +13146,36 @@
 		String formName = StrutsParamUtils.getPraramValue("formName", "");
 		String materialName = StrutsParamUtils.getPraramValue("materialName", "");
 		String tousseName = StrutsParamUtils.getPraramValue("tousseName", "");
+		Long inspectItemId = StrutsParamUtils.getPraramLongValue("inspectItemId", 0L);
+		String responsibilityPart = null;
+		if(DatabaseUtil.isPoIdValid(inspectItemId)){
+			QualityMonitoringDefinition q = (QualityMonitoringDefinition)objectDao.getById(QualityMonitoringDefinition.class.getSimpleName(), inspectItemId);
+			responsibilityPart = q.getResponsibilityPart();
+		}
+		String extraQueryForResponsibilityPart = null;
+		String extraJoinForResponsibilityPart = null;
+		Map<String, Map<String,Integer>> washAmountMap = null;
+		if(QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING.equals(responsibilityPart)){
+			String recyclingTime = dateQueryAdapter.dateToVarchar1("rr.recyclingTime");
+			extraQueryForResponsibilityPart = ",rr.depart,ur.operationRoom,ur.circuitNurse, rr.recyclingUser,"+ recyclingTime +" recyclingTime ";
+			extraJoinForResponsibilityPart = " left join TousseInstance ti on ti.id=qmi.scanTousseInstance_id "
+					+ " left join RecyclingRecord rr on rr.id=ti.recyclingRecordId "
+					+ " left join UseRecord ur on ur.id=ti.useRecord_id ";
+		}else if(QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH.equals(responsibilityPart)){
+			String wdrStartDate = dateQueryAdapter.dateToVarchar1("wdr.startDate");
+			extraQueryForResponsibilityPart = ",wdr.disinfectIdentification,"+ wdrStartDate +" washStartDate,wdr.washPersonInCharge ";
+			extraJoinForResponsibilityPart = "   left join WashAndDisinfectRecord wdr on wdr.id=qmi.scanWashRecord_id ";
+			ReportQueryParams params = new ReportQueryParams();
+			int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
+			String sql = getWashWorkloadSql(params, startDate, endDate, querySupplyRoom, dataSoureOfMaterialsCountOfToussesInReports, true);
+			washAmountMap = getWashWorkloadAmountMap(sql, true);
+		}else if(QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION.equals(responsibilityPart)){
+			String wdrStartDate = dateQueryAdapter.dateToVarchar1("sr.startDate");
+			extraQueryForResponsibilityPart = ",s.name,sr.frequency,sr.sterilizationUser,"+ wdrStartDate +" sterilizationStartDate,sr.amount steAmount ";
+			extraJoinForResponsibilityPart = " left join TousseInstance ti on ti.id=qmi.scanTousseInstance_id "
+					+ " left join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id "
+					+ " left join Sterilizer s on s.id=sr.sterilizer_id ";
+		}
 		String extraQuery = "";
 		String extraJoin = "";
 		boolean isCustomADJAndIsFormNameIsADJ = false;//是否无菌包质量抽查登记表
@@ -13054,13 +13188,19 @@
 		
 		if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)
 				&& StringUtils.isNotBlank(formName)) {
-			
-//			String querySql = buildQuerySQL(startDate, endDate, querySupplyRoom,
-//					formName, materialName, tousseName, monitoringType);
 			String whereSql = buildWhereSQL(startDate, endDate, querySupplyRoom,
 					formName, materialName, tousseName, monitoringType);
-			String dataSql = dateQueryAdapter.dateToVarchar1("qmi.dateTime");
-			//CONVERT(varchar(10), qmi.dateTime, 120)  to_char(qmi.dateTime, 'yyyy-MM-dd')
+			String dataSql = dateQueryAdapter.dateToVarchar1("qmi.dateTime");			if(StringUtils.isNotBlank(extraQueryForResponsibilityPart) && "质量监测".equals(monitoringType)){
+				String sql2 = " select " + dataSql + " dateStr,"
+						  + " qmd.tousseName toussName,qmd.material material,qmd.amount amount,qmi.id qmiId,qmi.positionMsg positionMsg,fi.createUserName "
+						  + extraQuery + extraQueryForResponsibilityPart
+						  + " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
+						  + " left join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id "
+						  + extraJoin + extraJoinForResponsibilityPart
+						  + " where 1=1 "
+						  + " and " + whereSql;
+				addMonitoringItemBeanOption(list,sql2,isCustomADJAndIsFormNameIsADJ,washAmountMap);
+			}
 			String sql =  " select " + dataSql + " dateStr,"
 						+ " qmd.tousseName toussName,qmd.material material,qmd.amount amount,qmi.id qmiId,qmi.positionMsg positionMsg,"
 						+ " fdi.name fdiName, fdi.orderNumber orderNum,fdio.value,fiov.id,fi.createUserName "
@@ -13072,7 +13212,7 @@
 						+ " left join FormInstanceOptionValue fiov on fiov.formInstanceItem_id=fiItem.id "
 						+ " and fiov.definitionItemOption_id=fdio.id "
 						+ " where (fdi.type = '" + FormDefinitionItem.TYPE_RADIO  + "' or fdi.type ='" + FormDefinitionItem.TYPE_CHECK  + "')" + " and " + whereSql;
-			addMonitoringItemBeanOptionRadioAndCHeck(list,sql,isCustomADJAndIsFormNameIsADJ);
+			addMonitoringItemBeanOptionRadioAndCHeck(list,sql,isCustomADJAndIsFormNameIsADJ, monitoringType);
 			// 没有录入材料和包，有配了多选的细则的项
 			sql =  " select " + dataSql + " dateStr,"
 					+ " qmi.id qmiId,qmi.positionMsg positionMsg,"
@@ -13086,8 +13226,7 @@
 					+ " and fiov.definitionItemOption_id=fdio.id "
 					+ " where (fdi.type = '" + FormDefinitionItem.TYPE_RADIO  + "' or fdi.type ='" + FormDefinitionItem.TYPE_CHECK  + "')" + " and " + whereSql
 					+ "  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) ";
-			addMonitoringItemBeanOptionRadioAndCHeckWithoutMaterial(list,sql,isCustomADJAndIsFormNameIsADJ);
-		
+			addMonitoringItemBeanOptionRadioAndCHeckWithoutMaterial(list,sql,isCustomADJAndIsFormNameIsADJ, monitoringType);
 			sql = " select " + dataSql + " dateStr,"
 				  + " qmd.tousseName toussName,qmd.material material,qmd.amount amount,qmi.id qmiId,qmi.positionMsg positionMsg,"
 				  + " fdi.name fdiName, fdi.orderNumber orderNum,fiItem.answer amswer,fi.createUserName "
@@ -13097,7 +13236,7 @@
 				  + " join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id "
 				  + extraJoin
 				  + " where (fdi.type != '" + FormDefinitionItem.TYPE_RADIO  + "' and fdi.type!='" + FormDefinitionItem.TYPE_CHECK + "')" + " and " + whereSql;
-			addMonitoringItemBeanOptionSingleResult(list,sql,isCustomADJAndIsFormNameIsADJ);
+			addMonitoringItemBeanOptionSingleResult(list,sql,isCustomADJAndIsFormNameIsADJ,monitoringType);
 			// 没有录入材料和包，单一的结果
 			sql = " select " + dataSql + " dateStr,"
 					  + " qmi.id qmiId,qmi.positionMsg positionMsg,"
@@ -13108,7 +13247,7 @@
 					  + extraJoin
 					  + " where (fdi.type != '" + FormDefinitionItem.TYPE_RADIO  + "' and fdi.type!='" + FormDefinitionItem.TYPE_CHECK + "')" + " and " + whereSql
 					  + " 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,isCustomADJAndIsFormNameIsADJ);
+			addMonitoringItemBeanOptionSingleResultWithoutMaterial(list,sql,isCustomADJAndIsFormNameIsADJ,monitoringType);
 			
 			if(FormDefinition.FOMRTYPE_QUALITYMONITORING.equals(monitoringType)){
 				sql = " select " + dataSql + " dateStr,"
@@ -13121,7 +13260,7 @@
 						+ " where qmi.id not in (select formInstance_id from FormInstanceItem) " 
 						+ " and qmi.type = '" + FormDefinition.FOMRTYPE_QUALITYMONITORING + "' "
 						+ " and " + whereSql;
-				addMonitoringItemBeanQualityMonitoring(list,sql,isCustomADJAndIsFormNameIsADJ);
+				addMonitoringItemBeanQualityMonitoring(list,sql,isCustomADJAndIsFormNameIsADJ,monitoringType);
 			}
 			//是否无菌包质量抽查登记表,是则隐藏监测结果列
 			Map<String, Integer> isQualifiedAmount = new HashMap<String, Integer>();
@@ -13139,74 +13278,13 @@
 			Integer qmCount = 0;
 			// 材料或者包数量和
 			Integer qmTousseAndMaterialAmount = 0;
-			sql =  " select count(0),sum(t.aAmount) from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
-					+ " join ( select qmi.id qid,sum(qmd.amount) aAmount from QualityMonitoringInstance qmi,QualityMonitoringGoods qmd where qmi.id=qmd.qualityMonitoringInstance_id "
-					+ " group by qmi.id ) t on t.qid=qmi.id "
-					+ " where " + whereSql;
-			ResultSet rs = objectDao.executeSql(sql);
-			try {
-				while (rs.next()) {
-					qmCount = rs.getInt(1);
-					qmTousseAndMaterialAmount = rs.getInt(2);
-				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}finally {
-				DatabaseUtil.closeResultSetAndStatement(rs);
-			}
-					
-//			List<QualityMonitoringInstance> qmInstanceList = objectDao.findBySql(QualityMonitoringInstance.class.getSimpleName(), querySql);
-//			for (QualityMonitoringInstance qmInstance : qmInstanceList) {
-//				String dateStr = "";
-//				if(qmInstance.getDateTime() != null){
-//					dateStr = Constants.SIMPLEDATEFORMAT_YYYYMMDD.format(qmInstance.getDateTime());
-//				}
-//				List<FormInstanceItem> instanceItems = qmInstance.getItems();
-//				if(instanceItems != null){
-//					for (FormInstanceItem formInstanceItem : instanceItems) {
-//						FormDefinitionItem definitionItem = formInstanceItem.getDefinitionItem();
-//						if (FormDefinitionItem.TYPE_RADIO.equals(definitionItem.getType())
-//								|| FormDefinitionItem.TYPE_CHECK
-//										.equals(definitionItem.getType())) {
-//							List<FormDefinitionItemOption> options = definitionItem
-//									.getOptions();
-//							if (options != null) {
-//								for (FormDefinitionItemOption option : options) {
-//									String questionName = definitionItem.getName();
-//									String optionStr = option.getValue();
-//									String answer = formInstanceItem.isChecked(option) ? "√" : "";
-//									newMonitoringItem(list, qmInstance,dateStr, definitionItem.getOrderNumber(), questionName,optionStr, answer);
-//								}
-//							}
-//						} else {
-//							newMonitoringItem(list, qmInstance, dateStr,definitionItem.getOrderNumber(), 
-//									"-",definitionItem.getName(),formInstanceItem.getAnswer());
-//						}
-//					}
-//				}
-//				if("质量监测".equals(monitoringType) && CollectionUtils.isEmpty(instanceItems)){
-//					newMonitoringItem(list, qmInstance, dateStr,1,"-","-","");
-//				}
-//				//
-//				if ("定期监测".equals(monitoringType)) {
-//					newMonitoringItem(list, qmInstance, dateStr,100,"-","监测结果",qmInstance.getResult());
-//				}
-//			}
-			// 质量检测加数量汇总
-			if ("质量监测".equals(monitoringType)) {
+			// 质量检测加数量汇总(取消质量监测汇总)
+			if (false) {
 				Integer totalAmount = 0;
 				Integer totalItem = 0;
 				Integer orderNumber = 1;
 				String option = "";
 				String questionName = "";
-//				for (QualityMonitoringInstance qualityMonitoring2 : qmInstanceList) {
-//					Integer amount = qualityMonitoring2.getAmount();
-//					if(amount == null){
-//						amount = 0;
-//					}
-//					totalAmount += amount;
-//					totalItem++;
-//				}
 				totalAmount = qmTousseAndMaterialAmount;
 				totalItem = qmCount;
 				if (list != null && list.size() > 0) {
@@ -13280,19 +13358,26 @@
 				list.add(bean);
 				}
 			}else if("定期监测".equals(monitoringType)){
+				sql =  " select count(0),sum(t.aAmount) from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
+						+ " join ( select qmi.id qid,sum(qmd.amount) aAmount from QualityMonitoringInstance qmi,QualityMonitoringGoods qmd where qmi.id=qmd.qualityMonitoringInstance_id "
+						+ " group by qmi.id ) t on t.qid=qmi.id "
+						+ " where " + whereSql;
+				ResultSet rs = objectDao.executeSql(sql);
+				try {
+					while (rs.next()) {
+						qmCount = rs.getInt(1);
+						qmTousseAndMaterialAmount = rs.getInt(2);
+					}
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}finally {
+					DatabaseUtil.closeResultSetAndStatement(rs);
+				}
 				Integer totalAmount = 0;
 				Integer totalItem = 0;
 				Integer orderNumber = 1;
 				String option = "";
 				String questionName = "";
-//				for (QualityMonitoringInstance qualityMonitoring2 : qmInstanceList) {
-//					Integer amount = qualityMonitoring2.getAmount();
-//					if(amount == null){
-//						amount = 0;
-//					}
-//					totalAmount += amount;
-//					totalItem++;
-//				}
 				totalAmount = qmTousseAndMaterialAmount;
 				totalItem = qmCount;
 				if (list != null && list.size() > 0) {
@@ -14199,6 +14284,20 @@
 		}
 	}
 	/**
+	 * 根据不同的监测类型 调用不同的处理方法
+	 * @param list
+	 * @param sql
+	 * @param isCustomADJAndIsFormNameIsADJ
+	 * @param monitoringType
+	 */
+	private void addMonitoringItemBeanOptionRadioAndCHeck(List<MonitoringItemBean> list,String sql, boolean isCustomADJAndIsFormNameIsADJ, String monitoringType){
+		if("质量监测".equals(monitoringType)){//质量监测
+			addMonitoringItemBeanOptionRadioAndCHeckForQualityMonitoring(list, sql, isCustomADJAndIsFormNameIsADJ);
+		}else{//定期监测
+			addMonitoringItemBeanOptionRadioAndCHeck(list, sql, isCustomADJAndIsFormNameIsADJ);
+		}
+	}
+	/**
 	 * 添加质量监测记录的bean  单选和多选的结果
 	 * @param list
 	 * @param sql
@@ -14238,6 +14337,204 @@
 		}
 	}
 	/**
+	 * 质量监测添加动态列
+	 * @param list
+	 * @param sql
+	 * @param isCustomADJAndIsFormNameIsADJ
+	 * @param washAmountMap 清洗数量map
+	 */
+	private void addMonitoringItemBeanOption(List<MonitoringItemBean> list,String sql, boolean isCustomADJAndIsFormNameIsADJ, Map<String, Map<String,Integer>> washAmountMap){
+		if(StringUtils.isBlank(sql)){
+			return ;
+		}
+		ResultSet rs = null;
+		try {
+			rs = objectDao.executeSql(sql);
+			while (rs.next()) {
+				String dataStr = rs.getString("dateStr");
+				String tousseName = rs.getString("toussName");
+				if(StringUtils.isBlank(tousseName)){
+					tousseName = rs.getString("material");	
+				}
+				if(StringUtils.isBlank(tousseName)){
+					tousseName = "";
+				}
+				int amount = rs.getInt("amount");
+				Long qmiId = rs.getLong("qmiId");
+				String positionMsg = rs.getString("positionMsg");
+				String createUserName = rs.getString("createUserName");
+				int frequency = 0;
+				String sterilizerName = null;
+				if(isCustomADJAndIsFormNameIsADJ){
+					frequency = rs.getInt("frequency");
+					sterilizerName = rs.getString("sterilizerName");
+				}
+				if(SqlUtils.isExistColumn(rs, "sterilizationStartDate")){
+					String name = rs.getString("name");
+					if(StringUtils.isNotBlank(name)){
+						int steFrequency = rs.getInt("frequency");
+						name = name + ",第" + steFrequency + "炉";
+					}
+					if(StringUtils.isNotBlank(name)){
+						name = "";
+					}
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 10, "灭菌批号", "",name ,frequency,sterilizerName,isCustomADJAndIsFormNameIsADJ,createUserName);
+					String sterilizationUser = rs.getString("sterilizationUser");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 11, "灭菌员","", sterilizationUser,frequency,sterilizerName,isCustomADJAndIsFormNameIsADJ,createUserName);
+					String startDate = rs.getString("sterilizationStartDate");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 12, "灭菌时间","", startDate,frequency,sterilizerName,isCustomADJAndIsFormNameIsADJ,createUserName);
+					Integer steAmount = rs.getInt("steAmount");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 13, "当次炉次灭菌总包数","", steAmount + "",frequency,sterilizerName,isCustomADJAndIsFormNameIsADJ,createUserName);
+				}else if(SqlUtils.isExistColumn(rs, "washStartDate")){
+					String startDate = null;
+					String disinfectIdentification = null;
+					disinfectIdentification = rs.getString("disinfectIdentification");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+								dataStr, 7, "清洗机","", disinfectIdentification, frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+					startDate = rs.getString("washStartDate");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+								dataStr, 8, "清洗开始时间","", startDate, frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+					Integer forgonAmount = 0;
+					Integer totalAmout = 0;
+					if(MapUtils.isNotEmpty(washAmountMap)){
+						Map<String, Integer> washAmountMapItem = washAmountMap.get(startDate);
+						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");
+						newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+									dataStr, 9, "清洗责任人","", washPersonInCharge, frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+					}
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+								dataStr, 10, "当天清洗件数","", totalAmout + "", frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+								dataStr, 11, "当天清洗外来器械件数","", forgonAmount + "", frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+				}else if(SqlUtils.isExistColumn(rs, "recyclingTime")){
+					String depart = rs.getString("depart");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 9, "回收科室","", depart, frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+					String operationRoom = rs.getString("operationRoom");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 10, "手术间","", operationRoom, frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+					String circuitNurse = rs.getString("circuitNurse");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 11, "巡回护士","", circuitNurse, frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+					String recyclingUser = rs.getString("recyclingUser");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 12, "回收员","", recyclingUser, frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+					String recyclingTime = rs.getString("recyclingTime");
+					newMonitoringItem(list, amount,tousseName,tousseName,qmiId,positionMsg,
+							dataStr, 13, "回收时间","", recyclingTime, frequency, sterilizerName, isCustomADJAndIsFormNameIsADJ,createUserName);
+				}
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+	}
+	/**
+	 * 添加质量监测记录的bean  单选和多选的结果 (质量监测使用)
+	 * @param list
+	 * @param sql
+	 */
+	private void addMonitoringItemBeanOptionRadioAndCHeckForQualityMonitoring(List<MonitoringItemBean> list,String sql, boolean isCustomADJAndIsFormNameIsADJ){
+		if(StringUtils.isBlank(sql)){
+			return ;
+		}
+		ResultSet rs = null;
+		try {
+			rs = objectDao.executeSql(sql);
+			Map<String, MonitoringItemBean> answersMap = new HashMap<String, MonitoringItemBean>();
+			int a = 0;
+			while (rs.next()) {
+				Long fiovId = rs.getLong("id");
+				if(fiovId <= 0){
+					continue;
+				}
+				String dataStr = rs.getString("dateStr");
+				String tousseName = rs.getString("toussName");
+				if(StringUtils.isBlank(tousseName)){
+					tousseName = rs.getString("material");
+				}
+				int amount = rs.getInt("amount");
+				Long qmiId = rs.getLong("qmiId");
+				String positionMsg = rs.getString("positionMsg");
+				String questionName = rs.getString("fdiName");
+				int orderNum = rs.getInt("orderNum");
+				String optionStr = rs.getString("value");
+				String createUserName = rs.getString("createUserName");
+				int frequency = 0;
+				String sterilizerName = null;
+				if(isCustomADJAndIsFormNameIsADJ){
+					frequency = rs.getInt("frequency");
+					sterilizerName = rs.getString("sterilizerName");;
+				}			
+				String key = tousseName + questionName + qmiId;
+				MonitoringItemBean mib = null;
+				if(answersMap.containsKey(key)){
+					mib = answersMap.get(key);
+					mib.setAnswer(mib.getAnswer() + "、" + optionStr);
+				}else{
+					mib = new MonitoringItemBean();
+					mib.setAmount(amount);
+					mib.setDateTime(dataStr);
+					mib.setGoodsName(tousseName);
+					mib.setQualityMonitoringInstanceId(qmiId);
+					mib.setPositionMsg(positionMsg);
+					mib.setOrderNumber(orderNum);
+					mib.setQuestionName(questionName);
+					mib.setAnswer(optionStr);
+					mib.setCreateUserName(createUserName);
+					if(isCustomADJAndIsFormNameIsADJ){
+						mib.setFrequency(frequency);
+						mib.setSterilizerName(sterilizerName);
+					}
+					answersMap.put(key, mib);
+				}
+			}
+			for(Entry<String, MonitoringItemBean> entry : answersMap.entrySet()){
+				MonitoringItemBean mib = entry.getValue();
+				newMonitoringItem(list, mib.getAmount(),mib.getGoodsName(),mib.getGoodsName(),
+						mib.getQualityMonitoringInstanceId(),mib.getPositionMsg(),
+						mib.getDateTime(), mib.getOrderNumber(),
+						mib.getQuestionName(),mib.getOption(),
+						mib.getAnswer(),mib.getFrequency(),
+						mib.getSterilizerName(),isCustomADJAndIsFormNameIsADJ,
+						mib.getCreateUserName());
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+	}
+	/**
+	 * 根据不同的监测类型调用不同的处理方法  添加质量监测记录的bean  没有包和材料时，单选和多选的结果
+	 * @param list
+	 * @param sql
+	 * @param addMonitoringItemBeanOptionSingleResult
+	 * @param monitoringType 监测类型
+	 */
+	private void addMonitoringItemBeanOptionRadioAndCHeckWithoutMaterial(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanOptionSingleResult, String monitoringType){
+		if("质量监测".equals(monitoringType)){
+			addMonitoringItemBeanOptionRadioAndCHeckWithoutMaterialForQualityMonitoring(list, sql, addMonitoringItemBeanOptionSingleResult);
+		}else{
+			addMonitoringItemBeanOptionRadioAndCHeckWithoutMaterial(list, sql, addMonitoringItemBeanOptionSingleResult);
+		}
+	}
+	/**
 	 * 添加质量监测记录的bean  没有包和材料时，单选和多选的结果
 	 * @param list
 	 * @param sql
@@ -14273,17 +14570,81 @@
 			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 	}
+	private void addMonitoringItemBeanOptionRadioAndCHeckWithoutMaterialForQualityMonitoring(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanOptionSingleResult){
+		if(StringUtils.isBlank(sql)){
+			return ;
+		}
+		ResultSet rs = null;	
+		try {
+			Map<String, MonitoringItemBean> answersMap = new HashMap<String, MonitoringItemBean>();
+			rs = objectDao.executeSql(sql);
+			while (rs.next()) {
+				Long fiovId = rs.getLong("id");
+				if(fiovId <= 0){
+					continue;
+				}
+				String dataStr = rs.getString("dateStr");
+				Long qmiId = rs.getLong("qmiId");
+				String positionMsg = rs.getString("positionMsg");
+				String questionName = rs.getString("fdiName");
+				int orderNum = rs.getInt("orderNum");
+				String optionStr = rs.getString("value");			
+				String createUserName = rs.getString("createUserName");
+				int frequency = 0;
+				String sterilizerName = null;
+				if(addMonitoringItemBeanOptionSingleResult){
+					frequency = rs.getInt("frequency");
+					sterilizerName = rs.getString("sterilizerName");
+				}
+				String key = questionName + qmiId;
+				MonitoringItemBean mib = null;
+				if(answersMap.containsKey(key)){
+					mib = answersMap.get(key);
+					mib.setAnswer(mib.getAnswer() + "、" + optionStr);
+				}else{
+					mib = new MonitoringItemBean();
+					mib.setDateTime(dataStr);
+					mib.setQualityMonitoringInstanceId(qmiId);
+					mib.setPositionMsg(positionMsg);
+					mib.setOrderNumber(orderNum);
+					mib.setQuestionName(questionName);
+					mib.setAnswer(optionStr);
+					mib.setCreateUserName(createUserName);
+					if(addMonitoringItemBeanOptionSingleResult){
+						mib.setFrequency(frequency);
+						mib.setSterilizerName(sterilizerName);
+					}
+					answersMap.put(key, mib);
+				}
+			}
+			for(Entry<String, MonitoringItemBean> entry : answersMap.entrySet()){
+				MonitoringItemBean mib = entry.getValue();
+				newMonitoringItem(list, 0,"","",
+						mib.getQualityMonitoringInstanceId(),mib.getPositionMsg(),
+						mib.getDateTime(), mib.getOrderNumber(),
+						mib.getQuestionName(),mib.getOption(),
+						mib.getAnswer(),mib.getFrequency(),
+						mib.getSterilizerName(),addMonitoringItemBeanOptionSingleResult,
+						mib.getCreateUserName());
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+	}
 	/**
 	 * 添加质量监测记录的bean  单一的结果
 	 * @param list
 	 * @param sql
 	 */
-	private void addMonitoringItemBeanOptionSingleResult(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanOptionSingleResult){
+	private void addMonitoringItemBeanOptionSingleResult(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanOptionSingleResult, String monitoringType){
 		if(StringUtils.isBlank(sql)){
 			return ;
 		}
-		ResultSet rs = objectDao.executeSql(sql);
+		ResultSet rs = null;
 		try {
+			rs = objectDao.executeSql(sql);
 			while (rs.next()) {
 				String dataStr = rs.getString(1);
 				String tousseName = rs.getString(2);
@@ -14301,8 +14662,14 @@
 					frequency = rs.getInt("frequency");
 					sterilizerName = rs.getString("sterilizerName");
 				}
+				String finalQuestionName = null;
+				if("质量监测".equals(monitoringType)){
+					finalQuestionName = questionName;
+				}else{
+					finalQuestionName = "-";
+				}
 				newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
-						dataStr, orderNum, "-",questionName, answer, frequency, sterilizerName, addMonitoringItemBeanOptionSingleResult,createUserName);
+						dataStr, orderNum, finalQuestionName,questionName, answer, frequency, sterilizerName, addMonitoringItemBeanOptionSingleResult,createUserName);
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
@@ -14315,7 +14682,7 @@
 	 * @param list
 	 * @param sql
 	 */
-	private void addMonitoringItemBeanOptionSingleResultWithoutMaterial(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanOptionSingleResultWithoutMaterial){
+	private void addMonitoringItemBeanOptionSingleResultWithoutMaterial2(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanOptionSingleResultWithoutMaterial){
 		if(StringUtils.isBlank(sql)){
 			return ;
 		}
@@ -14336,25 +14703,61 @@
 					sterilizerName = rs.getString("sterilizerName");
 				}
 				newMonitoringItem(list, 0,"","",qmiId,positionMsg,
-						dataStr, orderNum, "-",questionName, answer ,frequency ,sterilizerName, addMonitoringItemBeanOptionSingleResultWithoutMaterial,createUserName);
+						dataStr, orderNum, questionName,questionName, answer ,frequency ,sterilizerName, addMonitoringItemBeanOptionSingleResultWithoutMaterial,createUserName);
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}finally {
 			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 	}
+	private void addMonitoringItemBeanOptionSingleResultWithoutMaterial(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanOptionSingleResultWithoutMaterial, String monitoringType){
+		if(StringUtils.isBlank(sql)){
+			return ;
+		}
+		ResultSet rs = objectDao.executeSql(sql);
+		try {
+			while (rs.next()) {
+				String dataStr = rs.getString(1);
+				Long qmiId = rs.getLong(2);
+				String positionMsg = rs.getString(3);
+				String questionName = rs.getString(4);
+				int orderNum = rs.getInt(5);
+				String answer = rs.getString(6);
+				String createUserName = rs.getString("createUserName");
+				int frequency = 0;
+				String sterilizerName = null;
+				if(addMonitoringItemBeanOptionSingleResultWithoutMaterial){
+					frequency = rs.getInt("frequency");
+					sterilizerName = rs.getString("sterilizerName");
+				}
+				String finalQuestionName = null;
+				if("质量监测".equals(monitoringType)){
+					finalQuestionName = questionName;
+				}else{
+					finalQuestionName = "-";
+				}
+				newMonitoringItem(list, 0,"","",qmiId,positionMsg,
+						dataStr, orderNum, finalQuestionName,questionName, answer ,frequency ,sterilizerName, addMonitoringItemBeanOptionSingleResultWithoutMaterial,createUserName);
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+	}
 	/**
 	 * 添加质量监测记录的bean  没有监测细则的记录
 	 * @param list
 	 * @param sql
 	 */
-	private void addMonitoringItemBeanQualityMonitoring(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanQualityMonitoring){
+	private void addMonitoringItemBeanQualityMonitoring(List<MonitoringItemBean> list,String sql, boolean addMonitoringItemBeanQualityMonitoring, String monitoringType){
 		if(StringUtils.isBlank(sql)){
 			return ;
 		}
-		ResultSet rs = objectDao.executeSql(sql);
+		ResultSet rs = null;
 		try {
+			rs = objectDao.executeSql(sql);
 			while (rs.next()) {
 				String dataStr = rs.getString(1);
 				String tousseName = rs.getString(2);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationRecordItenBean.java
===================================================================
diff -u -r14512 -r27743
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationRecordItenBean.java	(.../SterilizationRecordItenBean.java)	(revision 14512)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationRecordItenBean.java	(.../SterilizationRecordItenBean.java)	(revision 27743)
@@ -9,7 +9,7 @@
 	// 灭菌员
 	private String sterilizationUser;
 	// 炉次
-	private Integer frequency;
+	private String frequency;
 	// 灭菌炉
 	private String sterilizerName;
 	// 器械包名字
@@ -28,10 +28,10 @@
 	public void setSterilizationUser(String sterilizationUser) {
 		this.sterilizationUser = sterilizationUser;
 	}
-	public Integer getFrequency() {
+	public String getFrequency() {
 		return frequency;
 	}
-	public void setFrequency(Integer frequency) {
+	public void setFrequency(String frequency) {
 		this.frequency = frequency;
 	}
 	public String getSterilizerName() {
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r27407 -r27743
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 27407)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 27743)
@@ -98,6 +98,8 @@
 		var startDate = $Id('startDate').value;
 		var endDate = $Id('endDate').value;
 		var monitoringType = $Id('monitoringType').value;
+		var monitoringTypeId = $Id('monitoringType').RawValue;
+		var inspectItemId = Ext.getCmp('inspectItem').getValue();
 		var formName = Ext.getCmp('inspectItem').getRawValue();
 		if(formName == ""){
 			showResult("请选择监测项");
@@ -133,6 +135,7 @@
 			querySupplyRoom : querySupplyRoom,
 			materialName : materialName,
 			tousseName : tousseName,
+			inspectItemId : inspectItemId,
 			reportName:'QualityMonitoring'
 		}
 
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java
===================================================================
diff -u -r27651 -r27743
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java	(.../MonitoringItemBean.java)	(revision 27651)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java	(.../MonitoringItemBean.java)	(revision 27743)
@@ -38,6 +38,11 @@
 	 * 登记人
 	 */
 	private String createUserName;
+	/**
+	 * 监测实例id
+	 */
+	private Long qualityMonitoringInstanceId;
+	
 	public Long getId() {
 		return id;
 	}
@@ -141,5 +146,13 @@
 	public void setCreateUserName(String createUserName) {
 		this.createUserName = createUserName;
 	}
+
+	public Long getQualityMonitoringInstanceId() {
+		return qualityMonitoringInstanceId;
+	}
+
+	public void setQualityMonitoringInstanceId(Long qualityMonitoringInstanceId) {
+		this.qualityMonitoringInstanceId = qualityMonitoringInstanceId;
+	}
 	
 }
Index: ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jasper
===================================================================
diff -u -r27617 -r27743
Binary files differ