Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml
===================================================================
diff -u -r15111 -r16880
--- ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml	(.../tousseDeliverDetailReport.jrxml)	(revision 15111)
+++ ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml	(.../tousseDeliverDetailReport.jrxml)	(revision 16880)
@@ -1,6 +1,6 @@
 <?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="890" pageHeight="660" columnWidth="890" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d128e6ed-b032-4c73-9a65-b0a6c94a3b23">
-	<property name="ireport.zoom" value="1.4641000000000035"/>
+<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="1070" pageHeight="660" columnWidth="1070" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d128e6ed-b032-4c73-9a65-b0a6c94a3b23">
+	<property name="ireport.zoom" value="1.2100000000000033"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
@@ -56,6 +56,8 @@
 		<fieldDescription><![CDATA[tousseName]]></fieldDescription>
 	</field>
 	<field name="washAndDisinfectAmount" class="java.lang.Integer"/>
+	<field name="applicationAmount" class="java.lang.Integer"/>
+	<field name="signAmount" class="java.lang.Integer"/>
 	<variable name="tAmount" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{tousseAmount}]]></variableExpression>
 	</variable>
@@ -77,10 +79,16 @@
 	<variable name="wAmount" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{washAndDisinfectAmount}]]></variableExpression>
 	</variable>
+	<variable name="aAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{applicationAmount}]]></variableExpression>
+	</variable>
+	<variable name="siAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{signAmount}]]></variableExpression>
+	</variable>
 	<title>
 		<band height="33" splitType="Stretch">
 			<textField>
-				<reportElement uuid="5286744f-96b7-4890-aec7-99ef9eb1a7b3" x="0" y="0" width="890" height="33"/>
+				<reportElement uuid="5286744f-96b7-4890-aec7-99ef9eb1a7b3" x="0" y="0" width="1070" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -105,54 +113,68 @@
 				<text><![CDATA[器械包名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7e199088-76ed-4abd-b0d8-48ac92f129e2" style="table_TH" x="710" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="7e199088-76ed-4abd-b0d8-48ac92f129e2" style="table_TH" x="800" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<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="800" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="890" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货器械数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="e175ace2-26cc-4f31-8175-e858554a772d" style="table_TH" x="260" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="e175ace2-26cc-4f31-8175-e858554a772d" style="table_TH" x="350" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<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="440" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="530" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[装配数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="3b548f4b-bd46-4358-8eb1-dd4cee91f549" style="table_TH" x="530" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="3b548f4b-bd46-4358-8eb1-dd4cee91f549" style="table_TH" x="620" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[审核数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="67af36bc-f6bc-40f9-9c1a-5acac42f9b45" style="table_TH" x="620" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="67af36bc-f6bc-40f9-9c1a-5acac42f9b45" style="table_TH" x="710" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[灭菌数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="e175ace2-26cc-4f31-8175-e858554a772d" style="table_TH" x="350" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="e175ace2-26cc-4f31-8175-e858554a772d" style="table_TH" x="440" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[清洗器械数量]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="e175ace2-26cc-4f31-8175-e858554a772d" style="table_TH" x="260" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<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="980" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[签收数量]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -172,54 +194,68 @@
 				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="da045ae7-2d36-46b1-a8b8-a58212e4a186" style="table_TD" x="710" y="0" width="90" height="33"/>
+				<reportElement uuid="da045ae7-2d36-46b1-a8b8-a58212e4a186" style="table_TD" x="800" y="0" width="90" height="33"/>
 				<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="800" y="0" width="90" height="33"/>
+				<reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="890" y="0" width="90" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{materialAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="2b5008cf-800d-4476-82c1-64403e67f6fc" style="table_TD" x="260" y="0" width="90" height="33"/>
+				<reportElement uuid="2b5008cf-800d-4476-82c1-64403e67f6fc" style="table_TD" x="350" y="0" width="90" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{recyclingAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="cd906c58-422b-4aaa-ad26-201597026308" style="table_TD" x="530" y="0" width="90" height="33"/>
+				<reportElement uuid="cd906c58-422b-4aaa-ad26-201597026308" style="table_TD" x="620" y="0" width="90" height="33"/>
 				<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="620" y="0" width="90" height="33"/>
+				<reportElement uuid="cf64ddaf-566e-411b-af7a-f3c51a845c1a" style="table_TD" x="710" y="0" width="90" height="33"/>
 				<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="440" y="0" width="90" height="33"/>
+				<reportElement uuid="0e898ad6-77eb-4dd8-943c-be899267c173" style="table_TD" x="530" y="0" width="90" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{packingAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="2b5008cf-800d-4476-82c1-64403e67f6fc" style="table_TD" x="350" y="0" width="90" height="33"/>
+				<reportElement uuid="2b5008cf-800d-4476-82c1-64403e67f6fc" style="table_TD" x="440" y="0" width="90" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{washAndDisinfectAmount}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="2b5008cf-800d-4476-82c1-64403e67f6fc" style="table_TD" x="260" y="0" width="90" height="33"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{applicationAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="980" y="0" width="90" height="33"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{signAmount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
@@ -232,54 +268,68 @@
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="ae3d31fc-9be6-49af-b773-3cc591934f1b" style="table_CH" x="710" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="ae3d31fc-9be6-49af-b773-3cc591934f1b" style="table_CH" x="800" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<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="800" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="890" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{mAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="001a07c0-d9e9-4451-a9e8-498bee7585b3" style="table_CH" x="260" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="001a07c0-d9e9-4451-a9e8-498bee7585b3" style="table_CH" x="350" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{rAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="440" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="530" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<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="530" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="faac7f2d-65df-4ee1-8d25-4e6c572c4a66" style="table_CH" x="620" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<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="620" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="602cd463-0838-48ae-878f-e5aafb8f80d2" style="table_CH" x="710" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="001a07c0-d9e9-4451-a9e8-498bee7585b3" style="table_CH" x="350" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<reportElement uuid="001a07c0-d9e9-4451-a9e8-498bee7585b3" style="table_CH" x="440" y="0" width="90" height="33" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{wAmount}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="001a07c0-d9e9-4451-a9e8-498bee7585b3" style="table_CH" x="260" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{aAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="980" y="0" width="90" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{siAmount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>