Index: ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedPositionPicChart.jrxml
===================================================================
diff -u -r12331 -r25560
--- ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedPositionPicChart.jrxml	(.../materialWashUnqualifiedPositionPicChart.jrxml)	(revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedPositionPicChart.jrxml	(.../materialWashUnqualifiedPositionPicChart.jrxml)	(revision 25560)
@@ -2,7 +2,7 @@
 <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="MaterialWashUnqualifiedPosition" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="118740f5-d7a3-4b93-a2d9-3686d293f987">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="59"/>
+	<property name="ireport.y" value="0"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -19,8 +19,8 @@
 	<title>
 		<band height="66" splitType="Stretch">
 			<textField>
-				<reportElement uuid="a5e5d52e-54da-47d7-a8db-79e7830ec713" x="0" y="0" width="555" height="66"/>
-				<textElement textAlignment="Center">
+				<reportElement uuid="a5e5d52e-54da-47d7-a8db-79e7830ec713" x="0" y="0" width="555" height="40"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dateInfo}]]></textFieldExpression>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r25535 -r25560
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 25535)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 25560)
@@ -4358,9 +4358,9 @@
 				+ "and fii.id = fio.formInstanceItem_id and fio.definitionItemOption_id = fdo.id "
 				+ " and qi.id=qmd.qualityMonitoringInstance_id "
 				+ " and fdi.name = '部位'"
-				+ " and fd.formName like '%器械清洗不合格%'"
+				+ " and (fd.formName like '%清洗不合格%' or fd.formName like '%清洗不及格%') "
 				+ " and fd.formType = '质量监测'"
-				+ " and fdo.isStatisticsItem = '是'"
+//				+ " and fdo.isStatisticsItem = '是'"
 				+ " and qi.datetime between "
 				+ dateQueryAdapter.dateAdapter(startDay)
 				+ " and "
@@ -4419,12 +4419,13 @@
 			Integer totalAmount = getAssessMethodInfo(startDay, endDay, list);
 			if (totalAmount.intValue() != 0) {
 				for (MaterialWashUnqualifiedPosition bean : list) {
-					bean.setPercentage(new BigDecimal(bean.getAmount()
+					String percentage = new BigDecimal(bean.getAmount()
 							.toString())
 							.divide(new BigDecimal(totalAmount.toString()), 2,
 									BigDecimal.ROUND_HALF_UP)
 							.multiply(new BigDecimal(100)).toString()
-							+ "%");
+							+ "%";
+					bean.setPercentage(percentage);
 				}
 			}
 
@@ -4443,9 +4444,9 @@
 				+ "and fii.id = fio.formInstanceItem_id and fio.definitionItemOption_id = fdo.id "
 				+ " and qi.id=qmd.qualityMonitoringInstance_id "
 				+ " and fdi.name = '评估方法'"
-				+ " and fd.formName like '%器械清洗不合格%'"
+				+ " and (fd.formName like '%清洗不合格%' or fd.formName like '%清洗不及格%') "
 				+ " and fd.formType = '质量监测'"
-				+ " and fdo.isStatisticsItem = '是'"
+//				+ " and fdo.isStatisticsItem = '是'"
 				+ " and qi.datetime between "
 				+ dateQueryAdapter.dateAdapter(startDay)
 				+ " and "
Index: ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedAssessMethodPicChart.jasper
===================================================================
diff -u -r12331 -r25560
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedPositionPicChart.jasper
===================================================================
diff -u -r12331 -r25560
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedAssessMethodPicChart.jrxml
===================================================================
diff -u -r12331 -r25560
--- ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedAssessMethodPicChart.jrxml	(.../materialWashUnqualifiedAssessMethodPicChart.jrxml)	(revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedAssessMethodPicChart.jrxml	(.../materialWashUnqualifiedAssessMethodPicChart.jrxml)	(revision 25560)
@@ -22,8 +22,8 @@
 	<title>
 		<band height="57" splitType="Stretch">
 			<textField>
-				<reportElement uuid="90357968-5331-4255-bb55-46a5f62697d5" x="0" y="0" width="555" height="57"/>
-				<textElement textAlignment="Center">
+				<reportElement uuid="90357968-5331-4255-bb55-46a5f62697d5" x="0" y="0" width="555" height="38"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dateInfo}]]></textFieldExpression>
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportLineChartView.jasper
===================================================================
diff -u -r18602 -r25560
Binary files differ