Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
===================================================================
diff -u -r14197 -r16989
--- ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml	(.../tousseWorkLoad.jrxml)	(revision 14197)
+++ ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml	(.../tousseWorkLoad.jrxml)	(revision 16989)
@@ -38,6 +38,9 @@
 	<field name="washAmount" class="java.lang.Integer">
 		<fieldDescription><![CDATA[washAmount]]></fieldDescription>
 	</field>
+	<field name="washMaterialAmount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[washMaterialAmount]]></fieldDescription>
+	</field>
 	<variable name="total1" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{recycleAmount}]]></variableExpression>
 	</variable>
@@ -56,10 +59,13 @@
 	<variable name="total6" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{invoiceAmount}]]></variableExpression>
 	</variable>
+	<variable name="washMaterialTotal" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{washMaterialAmount}]]></variableExpression>
+	</variable>
 	<title>
 		<band height="35" splitType="Stretch">
 			<textField>
-				<reportElement uuid="3ef5ef90-ca6c-42eb-855c-ff2336f47b62" x="0" y="0" width="630" height="35"/>
+				<reportElement uuid="3ef5ef90-ca6c-42eb-855c-ff2336f47b62" x="0" y="0" width="661" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -68,56 +74,70 @@
 		</band>
 	</title>
 	<columnHeader>
-		<band height="30" splitType="Stretch">
+		<band height="50" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="20a35ece-83c5-4c59-b660-3c40e8335230" style="table_TH" x="550" y="0" width="80" height="30"/>
+				<reportElement uuid="20a35ece-83c5-4c59-b660-3c40e8335230" style="table_TH" x="581" y="0" width="80" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="6c562c6e-21bb-46dc-8f79-6e2c4c833e9d" style="table_TH" x="470" y="0" width="80" height="30"/>
+				<reportElement uuid="6c562c6e-21bb-46dc-8f79-6e2c4c833e9d" style="table_TH" x="501" y="0" width="80" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[灭菌数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="fa4a9f27-80da-4353-a2d8-20bb59e59b96" style="table_TH" x="390" y="0" width="80" height="30"/>
+				<reportElement uuid="fa4a9f27-80da-4353-a2d8-20bb59e59b96" style="table_TH" x="421" y="0" width="80" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[审核数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="fce27322-67f3-440f-9499-810056775df6" style="table_TH" x="310" y="0" width="80" height="30"/>
+				<reportElement uuid="fce27322-67f3-440f-9499-810056775df6" style="table_TH" x="341" y="0" width="80" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[装配数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="230" y="0" width="80" height="30"/>
+				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="230" y="0" width="111" height="25"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[清洗数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="150" y="0" width="80" height="30"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="150" y="0" width="80" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[回收数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="0" y="0" width="150" height="30"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="0" y="0" width="150" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[器械包名称]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="230" y="25" width="57" height="25"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[器械包]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="a1538a54-4305-4db7-a6db-20f3be3dd406" style="table_TH" mode="Opaque" x="287" y="25" width="54" height="25"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[材料]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -137,40 +157,47 @@
 				<textFieldExpression><![CDATA[$F{recycleAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="76e5d263-0b65-4543-8c6b-06a09dde0b13" style="table_TD" x="230" y="0" width="80" height="30"/>
+				<reportElement uuid="76e5d263-0b65-4543-8c6b-06a09dde0b13" style="table_TD" x="230" y="0" width="57" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{washAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="5648384d-c720-4f33-a9eb-5a9927665523" style="table_TD" x="310" y="0" width="80" height="30"/>
+				<reportElement uuid="5648384d-c720-4f33-a9eb-5a9927665523" style="table_TD" x="341" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{packingAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="e91cc50d-d76b-4a41-9139-911aac4eacdf" style="table_TD" x="390" y="0" width="80" height="30"/>
+				<reportElement uuid="e91cc50d-d76b-4a41-9139-911aac4eacdf" style="table_TD" x="421" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{reviewAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4dd62fb1-0135-4375-9405-dab14c36521a" style="table_TD" x="470" y="0" width="80" height="30"/>
+				<reportElement uuid="4dd62fb1-0135-4375-9405-dab14c36521a" style="table_TD" x="501" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizationAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="100908a0-5975-4d49-be7b-5bb56c03e2cd" style="table_TD" x="550" y="0" width="80" height="30"/>
+				<reportElement uuid="100908a0-5975-4d49-be7b-5bb56c03e2cd" style="table_TD" x="581" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{invoiceAmount}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="a3f38068-a24a-45ef-bfdf-1339504f5940" style="table_TD" mode="Opaque" x="287" y="0" width="54" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{washMaterialAmount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
@@ -183,35 +210,35 @@
 				<textFieldExpression><![CDATA[$V{total1}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="dbf1fbba-532e-4700-83bc-dc575add559e" style="table_TH" x="230" y="0" width="80" height="30"/>
+				<reportElement uuid="dbf1fbba-532e-4700-83bc-dc575add559e" style="table_TH" x="230" y="0" width="57" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total2}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4343be57-f0fa-4cae-a74c-0e8432ca792d" style="table_TH" x="310" y="0" width="80" height="30"/>
+				<reportElement uuid="4343be57-f0fa-4cae-a74c-0e8432ca792d" style="table_TH" x="341" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="82ba4ba1-ddbf-43b7-ad35-d215dbdd78a8" style="table_TH" x="390" y="0" width="80" height="30"/>
+				<reportElement uuid="82ba4ba1-ddbf-43b7-ad35-d215dbdd78a8" style="table_TH" x="421" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total4}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="48b32252-64c6-431f-b2c1-a6fad55c3be5" style="table_TH" x="470" y="0" width="80" height="30"/>
+				<reportElement uuid="48b32252-64c6-431f-b2c1-a6fad55c3be5" style="table_TH" x="501" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tatal5}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="79024bf7-e3ca-4d4e-bdf5-0c0bee6e697f" style="table_TH" x="550" y="0" width="80" height="30"/>
+				<reportElement uuid="79024bf7-e3ca-4d4e-bdf5-0c0bee6e697f" style="table_TH" x="581" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
@@ -224,6 +251,13 @@
 				</textElement>
 				<text><![CDATA[合计]]></text>
 			</staticText>
+			<textField>
+				<reportElement uuid="9086bfb9-bdcb-49ed-b4a3-5bc03172fc72" style="table_TH" mode="Opaque" x="287" y="0" width="54" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{washMaterialTotal}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>