Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml
===================================================================
diff -u -r27889 -r27898
--- ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml	(.../tousseDeliverDetailReport.jrxml)	(revision 27889)
+++ ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml	(.../tousseDeliverDetailReport.jrxml)	(revision 27898)
@@ -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="tousseDeliverDetailReport" language="groovy" pageWidth="1020" pageHeight="660" columnWidth="1020" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d128e6ed-b032-4c73-9a65-b0a6c94a3b23">
+<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="tousseDeliverDetailReport" language="groovy" pageWidth="820" pageHeight="660" columnWidth="820" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d128e6ed-b032-4c73-9a65-b0a6c94a3b23">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -55,12 +55,6 @@
 	<field name="tousseName" class="java.lang.String">
 		<fieldDescription><![CDATA[tousseName]]></fieldDescription>
 	</field>
-	<field name="returnGoodsAmount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[returnGoodsAmount]]></fieldDescription>
-	</field>
-	<field name="washAndDisinfectAmount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[washAndDisinfectAmount]]></fieldDescription>
-	</field>
 	<variable name="tAmount" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{tousseAmount}]]></variableExpression>
 	</variable>
@@ -79,16 +73,10 @@
 	<variable name="sAmount" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{sterilizationAmount}]]></variableExpression>
 	</variable>
-	<variable name="retAmount" class="java.lang.Integer" calculation="Sum">
-		<variableExpression><![CDATA[$F{returnGoodsAmount}]]></variableExpression>
-	</variable>
-	<variable name="washAndDisinfectAmount" class="java.lang.Integer" calculation="Sum">
-		<variableExpression><![CDATA[$F{washAndDisinfectAmount}]]></variableExpression>
-	</variable>
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="5286744f-96b7-4890-aec7-99ef9eb1a7b3" x="0" y="0" width="999" height="30"/>
+				<reportElement uuid="5286744f-96b7-4890-aec7-99ef9eb1a7b3" x="0" y="0" width="799" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -113,68 +101,47 @@
 				<text><![CDATA[器械包名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7e199088-76ed-4abd-b0d8-48ac92f129e2" style="table_TH" x="709" y="0" width="90" height="30"/>
+				<reportElement uuid="7e199088-76ed-4abd-b0d8-48ac92f129e2" style="table_TH" x="619" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="799" y="0" width="90" height="30"/>
+				<reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="709" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货器械数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="439" y="0" width="90" height="30"/>
+				<reportElement uuid="e175ace2-26cc-4f31-8175-e858554a772d" style="table_TH" x="260" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[装配数量]]></text>
+				<text><![CDATA[回收数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="3b548f4b-bd46-4358-8eb1-dd4cee91f549" style="table_TH" x="529" y="0" width="90" height="30"/>
+				<reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="349" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[审核数量]]></text>
+				<text><![CDATA[装配数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="67af36bc-f6bc-40f9-9c1a-5acac42f9b45" style="table_TH" x="619" y="0" width="90" height="30"/>
+				<reportElement uuid="3b548f4b-bd46-4358-8eb1-dd4cee91f549" style="table_TH" x="439" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[灭菌数量]]></text>
+				<text><![CDATA[审核数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="889" y="0" width="90" height="30"/>
+				<reportElement uuid="67af36bc-f6bc-40f9-9c1a-5acac42f9b45" style="table_TH" x="529" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[退货数量]]></text>
+				<text><![CDATA[灭菌数量]]></text>
 			</staticText>
-			<staticText>
-				<reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="889" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
-				</textElement>
-				<text><![CDATA[退货数量]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="260" y="0" width="89" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
-				</textElement>
-				<text><![CDATA[回收数量]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="349" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
-				</textElement>
-				<text><![CDATA[清洗数量]]></text>
-			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -194,14 +161,14 @@
 				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="da045ae7-2d36-46b1-a8b8-a58212e4a186" style="table_TD" x="709" y="0" width="90" height="30"/>
+				<reportElement uuid="da045ae7-2d36-46b1-a8b8-a58212e4a186" style="table_TD" x="619" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tousseAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="799" y="0" width="90" height="30"/>
+				<reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="709" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -215,44 +182,30 @@
 				<textFieldExpression><![CDATA[$F{recyclingAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="cd906c58-422b-4aaa-ad26-201597026308" style="table_TD" x="529" y="0" width="90" height="30"/>
+				<reportElement uuid="cd906c58-422b-4aaa-ad26-201597026308" style="table_TD" x="439" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{reviewAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="cf64ddaf-566e-411b-af7a-f3c51a845c1a" style="table_TD" x="619" y="0" width="90" height="30"/>
+				<reportElement uuid="cf64ddaf-566e-411b-af7a-f3c51a845c1a" style="table_TD" x="529" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizationAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="0e898ad6-77eb-4dd8-943c-be899267c173" style="table_TD" x="439" y="0" width="90" height="30"/>
+				<reportElement uuid="0e898ad6-77eb-4dd8-943c-be899267c173" style="table_TD" x="349" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{packingAmount}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="889" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{returnGoodsAmount}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="0e898ad6-77eb-4dd8-943c-be899267c173" style="table_TD" x="349" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{washAndDisinfectAmount}]]></textFieldExpression>
-			</textField>
 		</band>
 	</detail>
 	<summary>
-		<band height="37" splitType="Stretch">
+		<band height="30" splitType="Stretch">
 			<staticText>
 				<reportElement uuid="85766b43-0bf1-4f42-9c16-0b1026261597" style="table_CH" x="0" y="0" width="260" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -261,14 +214,14 @@
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="ae3d31fc-9be6-49af-b773-3cc591934f1b" style="table_CH" x="709" y="0" width="90" height="30"/>
+				<reportElement uuid="ae3d31fc-9be6-49af-b773-3cc591934f1b" style="table_CH" x="619" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="799" y="0" width="90" height="30"/>
+				<reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="709" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -282,40 +235,26 @@
 				<textFieldExpression><![CDATA[$V{rAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="439" y="0" width="90" height="30"/>
+				<reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="349" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{pAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="faac7f2d-65df-4ee1-8d25-4e6c572c4a66" style="table_CH" x="529" y="0" width="90" height="30"/>
+				<reportElement uuid="faac7f2d-65df-4ee1-8d25-4e6c572c4a66" style="table_CH" x="439" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{reAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="602cd463-0838-48ae-878f-e5aafb8f80d2" style="table_CH" x="619" y="0" width="90" height="30"/>
+				<reportElement uuid="602cd463-0838-48ae-878f-e5aafb8f80d2" style="table_CH" x="529" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sAmount}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="false">
-				<reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="889" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{retAmount}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="349" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{washAndDisinfectAmount}]]></textFieldExpression>
-			</textField>
 		</band>
 	</summary>
 </jasperReport>