Index: ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml
===================================================================
diff -u -r14830 -r15324
--- ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml	(.../mainWashWorkloadReprot.jrxml)	(revision 14830)
+++ ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml	(.../mainWashWorkloadReprot.jrxml)	(revision 15324)
@@ -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="mainWashWorkloadReprot" language="groovy" pageWidth="730" pageHeight="1010" whenNoDataType="AllSectionsNoDetail" columnWidth="730" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0c6f37ac-fdd3-421e-ae7c-077bed75cba6">
+<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="mainWashWorkloadReprot" language="groovy" pageWidth="860" pageHeight="1010" whenNoDataType="AllSectionsNoDetail" columnWidth="860" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0c6f37ac-fdd3-421e-ae7c-077bed75cba6">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -69,13 +69,14 @@
 	<variable name="washTotalAmount" class="java.lang.Integer" calculation="Sum"/>
 	<variable name="disqualifiedAmount" class="java.lang.Integer" calculation="Sum"/>
 	<variable name="disqualifiedRate" class="java.lang.Double" calculation="Sum"/>
+	<variable name="secondWashAmount" class="java.lang.Integer" calculation="Sum"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<title>
 		<band height="26" splitType="Stretch">
 			<textField>
-				<reportElement uuid="2b053927-410c-4cc7-8e50-a7480c11693e" x="0" y="0" width="730" height="26"/>
+				<reportElement uuid="2b053927-410c-4cc7-8e50-a7480c11693e" x="0" y="0" width="860" height="26"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
@@ -114,33 +115,40 @@
 				<text><![CDATA[外来器械]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d705fe20-b0b8-43bb-a39d-81e58f135b78" style="table_TH" x="460" y="0" width="90" height="30"/>
+				<reportElement uuid="d705fe20-b0b8-43bb-a39d-81e58f135b78" style="table_TH" x="370" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[清洗总数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="91972b19-03f6-4d1b-b9a0-a056675502a6" style="table_TH" x="550" y="0" width="90" height="30"/>
+				<reportElement uuid="91972b19-03f6-4d1b-b9a0-a056675502a6" style="table_TH" x="460" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[不合格数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="04116231-a030-4193-9fa4-823ee29a50c3" style="table_TH" x="640" y="0" width="90" height="30"/>
+				<reportElement uuid="04116231-a030-4193-9fa4-823ee29a50c3" style="table_TH" x="550" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[不合格率%]]></text>
+				<text><![CDATA[不合格率]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a7a40694-d180-4501-b7ea-1015bd719183" style="table_TH" x="370" y="0" width="90" height="30"/>
+				<reportElement uuid="a7a40694-d180-4501-b7ea-1015bd719183" style="table_TH" x="640" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[消毒物品]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="55c28372-bbab-4485-8281-b8caedd1b708" style="table_TH" mode="Opaque" x="730" y="0" width="130" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[外来器械二次清洗]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -153,7 +161,7 @@
 				<textFieldExpression><![CDATA[$F{s_DATE}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement uuid="c30704e1-9b81-4a23-bc3f-8c101a253598" x="100" y="0" width="630" height="24" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="c30704e1-9b81-4a23-bc3f-8c101a253598" x="100" y="0" width="760" height="24" isPrintWhenDetailOverflows="true"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{childList})]]></dataSourceExpression>
 				<returnValue subreportVariable="vOrdinaryMaterial" toVariable="ordinaryMaterial" calculation="Sum"/>
 				<returnValue subreportVariable="vOperationMaterial" toVariable="operationMaterial" calculation="Sum"/>
@@ -162,14 +170,15 @@
 				<returnValue subreportVariable="vWashTotalAmount" toVariable="washTotalAmount" calculation="Sum"/>
 				<returnValue subreportVariable="vDisqualifiedAmount" toVariable="disqualifiedAmount" calculation="Sum"/>
 				<returnValue subreportVariable="vDisqualifiedRate" toVariable="disqualifiedRate" calculation="Sum"/>
+				<returnValue subreportVariable="vSecondWashForeignAmount" toVariable="secondWashAmount" calculation="Sum"/>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "washWorkloadReport.jasper"]]></subreportExpression>
 			</subreport>
 		</band>
 	</detail>
 	<summary>
 		<band height="36">
 			<textField pattern="#,##0.0000 %" isBlankWhenNull="true">
-				<reportElement uuid="7ce4f057-5e7e-41e6-a3dd-00e3078fbd65" style="table_CH" mode="Opaque" x="640" y="0" width="90" height="28">
+				<reportElement uuid="7ce4f057-5e7e-41e6-a3dd-00e3078fbd65" style="table_CH" mode="Opaque" x="550" y="0" width="90" height="28">
 					<property name="net.sf.jasperreports.export.jxl.cell.complex.format" value="true"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -199,21 +208,21 @@
 				<textFieldExpression><![CDATA[$V{outsideMaterial}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="b6b6f190-5560-4039-9713-f4b1afdcb897" style="table_CH" x="370" y="0" width="90" height="28"/>
+				<reportElement uuid="b6b6f190-5560-4039-9713-f4b1afdcb897" style="table_CH" x="640" y="0" width="90" height="28"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{disinfection}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="5cc73bc4-8ed6-4794-8216-8e76fdd08ba3" style="table_CH" x="460" y="0" width="90" height="28"/>
+				<reportElement uuid="5cc73bc4-8ed6-4794-8216-8e76fdd08ba3" style="table_CH" x="370" y="0" width="90" height="28"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{washTotalAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="3124d045-c70a-4940-a4d9-218b808b08b2" style="table_CH" x="550" y="0" width="90" height="28"/>
+				<reportElement uuid="3124d045-c70a-4940-a4d9-218b808b08b2" style="table_CH" x="460" y="0" width="90" height="28"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -226,6 +235,13 @@
 				</textElement>
 				<text><![CDATA[合计]]></text>
 			</staticText>
+			<textField>
+				<reportElement uuid="28d500ba-1f86-49de-939f-2c3eb9ce81f0" style="table_CH" mode="Opaque" x="730" y="0" width="130" height="28"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{secondWashAmount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>