Index: ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport_child.jrxml
===================================================================
diff -u -r19671 -r37728
--- ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport_child.jrxml	(.../SterilizerQualityReport_child.jrxml)	(revision 19671)
+++ ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport_child.jrxml	(.../SterilizerQualityReport_child.jrxml)	(revision 37728)
@@ -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="tousseWorkLoad_child" language="groovy" pageWidth="600" pageHeight="572" orientation="Landscape" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5f5dad50-b0b4-4f0c-b9be-c26f3870a728">
+<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="tousseWorkLoad_child" language="groovy" pageWidth="1050" pageHeight="572" orientation="Landscape" columnWidth="1050" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5f5dad50-b0b4-4f0c-b9be-c26f3870a728">
 	<property name="ireport.zoom" value="1.1000000000000008"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="96"/>
 	<property name="ireport.y" value="0"/>
 	<field name="tousseName" class="java.lang.String">
 		<fieldDescription><![CDATA[tousseName]]></fieldDescription>
@@ -15,13 +15,19 @@
 	<field name="sterilizationUser" class="java.lang.String">
 		<fieldDescription><![CDATA[sterilizationUser]]></fieldDescription>
 	</field>
+	<field name="isQualified" class="java.lang.String">
+		<fieldDescription><![CDATA[isQualified]]></fieldDescription>
+	</field>
+	<field name="noQualifiedInfo" class="java.lang.String">
+		<fieldDescription><![CDATA[noQualifiedInfo]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<detail>
 		<band height="38" splitType="Stretch">
-			<textField>
-				<reportElement uuid="8c150bdf-5279-466b-a223-ea849e1d637f" x="300" y="0" width="150" height="38"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="8c150bdf-5279-466b-a223-ea849e1d637f" stretchType="RelativeToBandHeight" x="300" y="0" width="150" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -34,8 +40,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sendDepart} == null?"":$F{sendDepart}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="89466395-e2a9-41a9-a3ef-66e3923ecbff" x="450" y="0" width="150" height="38"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="89466395-e2a9-41a9-a3ef-66e3923ecbff" stretchType="RelativeToBandHeight" x="450" y="0" width="150" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -46,10 +52,38 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
+				<textFieldExpression><![CDATA[$F{isQualified} == null ? "": $F{isQualified}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="89466395-e2a9-41a9-a3ef-66e3923ecbff" stretchType="RelativeToBandHeight" x="600" y="0" width="300" height="38"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{noQualifiedInfo} == null ? "": $F{noQualifiedInfo}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="89466395-e2a9-41a9-a3ef-66e3923ecbff" stretchType="RelativeToBandHeight" x="900" y="0" width="150" height="38"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="false"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizationUser} == null ? "": $F{sterilizationUser}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="eeeb33f9-5c48-4ae5-9400-bdc2ba47a990" x="0" y="0" width="200" height="38"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="eeeb33f9-5c48-4ae5-9400-bdc2ba47a990" stretchType="RelativeToBandHeight" x="0" y="0" width="200" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -62,8 +96,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tousseName} == null?"":$F{tousseName}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="5404fd12-fa60-40b7-8c40-d728c1b19c34" x="200" y="0" width="100" height="38"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="5404fd12-fa60-40b7-8c40-d728c1b19c34" stretchType="RelativeToBandHeight" x="200" y="0" width="100" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
Index: ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport_child.jasper
===================================================================
diff -u -r19671 -r37728
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport.jasper
===================================================================
diff -u -r19671 -r37728
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jasper
===================================================================
diff -u -r19681 -r37728
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport.jrxml
===================================================================
diff -u -r19671 -r37728
--- ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport.jrxml	(.../SterilizerQualityReport.jrxml)	(revision 19671)
+++ ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport.jrxml	(.../SterilizerQualityReport.jrxml)	(revision 37728)
@@ -1,5 +1,5 @@
 <?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="tousseWorkLoad" language="groovy" pageWidth="1000" pageHeight="760" columnWidth="1000" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5cc580bd-cd6f-4e34-8f78-a05ac8f31ce8">
+<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="tousseWorkLoad" language="groovy" pageWidth="1420" pageHeight="760" columnWidth="1420" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5cc580bd-cd6f-4e34-8f78-a05ac8f31ce8">
 	<property name="ireport.zoom" value="0.9090909090909098"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -33,7 +33,7 @@
 	<title>
 		<band height="38" splitType="Stretch">
 			<textField>
-				<reportElement uuid="3ef5ef90-ca6c-42eb-855c-ff2336f47b62" x="0" y="0" width="970" height="38"/>
+				<reportElement uuid="3ef5ef90-ca6c-42eb-855c-ff2336f47b62" x="0" y="0" width="1420" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -44,7 +44,7 @@
 	<columnHeader>
 		<band height="38" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="371" y="0" width="200" height="38"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="370" y="0" width="200" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -98,14 +98,28 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
+				<text><![CDATA[质量监测结果]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="fa4a9f27-80da-4353-a2d8-20bb59e59b96" style="table_TH" x="970" y="0" width="300" height="38"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[质量监测不合格说明]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="fa4a9f27-80da-4353-a2d8-20bb59e59b96" style="table_TH" x="1270" y="0" width="150" height="38"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
 				<text><![CDATA[灭菌员]]></text>
 			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="38" splitType="Stretch">
 			<subreport>
-				<reportElement uuid="9dd15949-fa7f-4d03-8dac-a567fa4583b4" x="370" y="0" width="600" height="38"/>
+				<reportElement uuid="9dd15949-fa7f-4d03-8dac-a567fa4583b4" stretchType="RelativeToBandHeight" x="370" y="0" width="1050" height="38"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{childrens})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "SterilizerQualityReport_child.jasper"]]></subreportExpression>
 			</subreport>
Index: ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jrxml
===================================================================
diff -u -r19681 -r37728
--- ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jrxml	(.../SterilizerQualityReportTotal.jrxml)	(revision 19681)
+++ ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jrxml	(.../SterilizerQualityReportTotal.jrxml)	(revision 37728)
@@ -113,7 +113,7 @@
 	</columnHeader>
 	<detail>
 		<band height="80" splitType="Stretch">
-			<textField>
+			<textField isStretchWithOverflow="true">
 				<reportElement uuid="f6914fc5-39bc-43c3-868f-e072efef9bc0" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="160" height="80" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -128,7 +128,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizerName}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true">
 				<reportElement uuid="f6914fc5-39bc-43c3-868f-e072efef9bc0" stretchType="RelativeToBandHeight" mode="Opaque" x="160" y="0" width="80" height="80" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -143,7 +143,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{frequency}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true">
 				<reportElement uuid="f6914fc5-39bc-43c3-868f-e072efef9bc0" stretchType="RelativeToBandHeight" mode="Opaque" x="240" y="0" width="112" height="80" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -158,7 +158,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true">
 				<reportElement uuid="f6914fc5-39bc-43c3-868f-e072efef9bc0" stretchType="RelativeToBandHeight" mode="Opaque" x="352" y="0" width="106" height="80" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -173,7 +173,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizationFinishTime}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true">
 				<reportElement uuid="f6914fc5-39bc-43c3-868f-e072efef9bc0" stretchType="RelativeToBandHeight" mode="Opaque" x="458" y="0" width="100" height="80" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -188,7 +188,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizerUser}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true">
 				<reportElement uuid="f6914fc5-39bc-43c3-868f-e072efef9bc0" stretchType="RelativeToBandHeight" mode="Opaque" x="558" y="0" width="100" height="80" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -203,7 +203,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{qualityRssult}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true">
 				<reportElement uuid="f6914fc5-39bc-43c3-868f-e072efef9bc0" stretchType="RelativeToBandHeight" mode="Opaque" x="658" y="0" width="312" height="80" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
 				<box>
 					<pen lineWidth="1.0"/>