Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jrxml
===================================================================
diff -u -r17578 -r19224
--- ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jrxml	(.../tousseWorkLoad_child.jrxml)	(revision 17578)
+++ ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jrxml	(.../tousseWorkLoad_child.jrxml)	(revision 19224)
@@ -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="880" pageHeight="572" orientation="Landscape" columnWidth="880" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5f5dad50-b0b4-4f0c-b9be-c26f3870a728">
-	<property name="ireport.zoom" value="1.4641000000000013"/>
-	<property name="ireport.x" value="21"/>
+<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="960" pageHeight="572" orientation="Landscape" columnWidth="960" 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.y" value="0"/>
 	<field name="invoiceAmount" class="java.lang.Integer">
 		<fieldDescription><![CDATA[invoiceAmount]]></fieldDescription>
@@ -33,6 +33,9 @@
 	<field name="signAmount" class="java.lang.Integer">
 		<fieldDescription><![CDATA[signAmount]]></fieldDescription>
 	</field>
+	<field name="inventoryAmount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[inventoryAmount]]></fieldDescription>
+	</field>
 	<variable name="applicationAmountCount" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{applicationAmount}]]></variableExpression>
 	</variable>
@@ -60,13 +63,19 @@
 	<variable name="signAmountCount" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{signAmount}]]></variableExpression>
 	</variable>
+	<variable name="tousseNameCount" class="java.lang.Integer" calculation="Count">
+		<variableExpression><![CDATA[$F{tousseName}]]></variableExpression>
+	</variable>
+	<variable name="inventoryAmountCount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{inventoryAmount}]]></variableExpression>
+	</variable>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<detail>
 		<band height="38" splitType="Stretch">
 			<textField>
-				<reportElement uuid="5e060a40-d763-4841-810a-fab1245d0b16" x="720" y="0" width="80" height="38"/>
+				<reportElement uuid="5e060a40-d763-4841-810a-fab1245d0b16" x="800" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -75,12 +84,12 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{invoiceAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8c150bdf-5279-466b-a223-ea849e1d637f" x="480" y="0" width="80" height="38"/>
+				<reportElement uuid="8c150bdf-5279-466b-a223-ea849e1d637f" x="560" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -89,7 +98,7 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{packingAmount}]]></textFieldExpression>
 			</textField>
@@ -103,12 +112,12 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{recycleAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="89466395-e2a9-41a9-a3ef-66e3923ecbff" x="560" y="0" width="80" height="38"/>
+				<reportElement uuid="89466395-e2a9-41a9-a3ef-66e3923ecbff" x="640" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -117,12 +126,12 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{reviewAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="1d268756-14da-4a3e-8f2b-5302b410705e" x="640" y="0" width="80" height="38"/>
+				<reportElement uuid="1d268756-14da-4a3e-8f2b-5302b410705e" x="720" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -131,7 +140,7 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizationAmount}]]></textFieldExpression>
 			</textField>
@@ -145,12 +154,12 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d44a2a03-7c21-405f-906f-703fbc051341" x="340" y="0" width="70" height="38"/>
+				<reportElement uuid="d44a2a03-7c21-405f-906f-703fbc051341" x="420" y="0" width="70" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -159,12 +168,12 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{washAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4f046e1a-8c19-4b23-a1c4-239c32cb1e14" x="410" y="0" width="70" height="38"/>
+				<reportElement uuid="4f046e1a-8c19-4b23-a1c4-239c32cb1e14" x="490" y="0" width="70" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -173,7 +182,7 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{washMaterialAmount}]]></textFieldExpression>
 			</textField>
@@ -187,12 +196,12 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{applicationAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="341ce140-79be-4c89-aad9-ffd80f57f136" x="800" y="0" width="80" height="38"/>
+				<reportElement uuid="5404fd12-fa60-40b7-8c40-d728c1b19c34" x="340" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -201,8 +210,22 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="false"/>
+					<font size="14" isBold="false"/>
 				</textElement>
+				<textFieldExpression><![CDATA[$F{inventoryAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="341ce140-79be-4c89-aad9-ffd80f57f136" x="880" y="0" width="80" 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{signAmount}]]></textFieldExpression>
 			</textField>
 		</band>
Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
===================================================================
diff -u -r18183 -r19224
--- ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml	(.../tousseWorkLoad.jrxml)	(revision 18183)
+++ ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml	(.../tousseWorkLoad.jrxml)	(revision 19224)
@@ -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="tousseWorkLoad" language="groovy" pageWidth="970" pageHeight="760" columnWidth="970" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5cc580bd-cd6f-4e34-8f78-a05ac8f31ce8">
-	<property name="ireport.zoom" value="1.1000000000000008"/>
+<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="1050" pageHeight="760" columnWidth="1050" 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"/>
 	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
@@ -51,12 +51,14 @@
 	<variable name="total9" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[]]></variableExpression>
 	</variable>
+	<variable name="total0" class="java.lang.Integer" calculation="Count"/>
+	<variable name="total10" class="java.lang.Integer" calculation="Sum"/>
 	<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="1050" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
@@ -65,72 +67,86 @@
 	<columnHeader>
 		<band height="38" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="20a35ece-83c5-4c59-b660-3c40e8335230" style="table_TH" x="810" y="0" width="80" height="38"/>
+				<reportElement uuid="20a35ece-83c5-4c59-b660-3c40e8335230" style="table_TH" x="890" y="0" width="80" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="430" y="0" width="140" height="19"/>
+				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="510" y="0" width="140" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[清洗数量]]></text>
 			</staticText>
 			<staticText>
 				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="350" y="0" width="80" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[回收数量]]></text>
 			</staticText>
 			<staticText>
 				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="90" y="0" width="180" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[器械包名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="430" y="19" width="70" height="19"/>
+				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="510" y="19" width="70" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[器械包数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a1538a54-4305-4db7-a6db-20f3be3dd406" style="table_TH" mode="Opaque" x="500" y="19" width="70" height="19"/>
+				<reportElement uuid="a1538a54-4305-4db7-a6db-20f3be3dd406" style="table_TH" mode="Opaque" x="580" y="19" width="70" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[器械件数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="270" y="0" width="80" height="38"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="430" y="0" width="80" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[申请数量]]></text>
+				<text><![CDATA[清点数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="6c562c6e-21bb-46dc-8f79-6e2c4c833e9d" style="table_TH" x="730" y="0" width="80" height="38"/>
+				<reportElement uuid="6c562c6e-21bb-46dc-8f79-6e2c4c833e9d" style="table_TH" x="810" y="0" width="80" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[灭菌数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="890" y="0" width="80" height="38"/>
+				<reportElement uuid="fce27322-67f3-440f-9499-810056775df6" style="table_TH" x="650" y="0" width="80" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
+				<text><![CDATA[装配数量]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="270" y="0" width="80" height="38"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[申请数量]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="970" y="0" width="80" 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="650" y="0" width="80" height="38"/>
+				<reportElement uuid="fa4a9f27-80da-4353-a2d8-20bb59e59b96" style="table_TH" x="730" y="0" width="80" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[审核数量]]></text>
 			</staticText>
@@ -144,24 +160,17 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<text><![CDATA[器械包类型]]></text>
 			</staticText>
-			<staticText>
-				<reportElement uuid="fce27322-67f3-440f-9499-810056775df6" style="table_TH" x="570" y="0" width="80" height="38"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
-				</textElement>
-				<text><![CDATA[装配数量]]></text>
-			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="38" splitType="Stretch">
 			<subreport>
-				<reportElement uuid="9dd15949-fa7f-4d03-8dac-a567fa4583b4" x="90" y="0" width="876" height="38"/>
+				<reportElement uuid="9dd15949-fa7f-4d03-8dac-a567fa4583b4" x="90" y="0" width="960" height="38"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{childrens})]]></dataSourceExpression>
 				<returnValue subreportVariable="applicationAmountCount" toVariable="total1" calculation="Sum"/>
 				<returnValue subreportVariable="recycleAmountCount" toVariable="total2" calculation="Sum"/>
@@ -172,6 +181,8 @@
 				<returnValue subreportVariable="sterilizationAmountCount" toVariable="total7" calculation="Sum"/>
 				<returnValue subreportVariable="invoiceAmountCount" toVariable="total8" calculation="Sum"/>
 				<returnValue subreportVariable="signAmountCount" toVariable="total9" calculation="Sum"/>
+				<returnValue subreportVariable="tousseNameCount" toVariable="total0" calculation="Sum"/>
+				<returnValue subreportVariable="inventoryAmountCount" toVariable="total10" calculation="Sum"/>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tousseWorkLoad_child.jasper"]]></subreportExpression>
 			</subreport>
 			<textField>
@@ -184,7 +195,7 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tousseType}]]></textFieldExpression>
@@ -194,14 +205,14 @@
 	<summary>
 		<band height="38">
 			<staticText>
-				<reportElement uuid="d9e129f3-e320-4acb-accc-aa6bdd642036" style="table_TH" x="0" y="0" width="270" height="38"/>
+				<reportElement uuid="d9e129f3-e320-4acb-accc-aa6bdd642036" style="table_TH" x="0" y="0" width="90" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="4936388e-7552-4858-9a42-7580d4e3abc6" mode="Opaque" x="270" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="4936388e-7552-4858-9a42-7580d4e3abc6" mode="Opaque" x="430" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -210,10 +221,10 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$V{total1}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{total10}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="f6411485-2447-49ed-a7d0-d930d5edb36f" mode="Opaque" x="350" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
@@ -225,13 +236,13 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total2}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="278d45a8-fc86-4ceb-af8b-80d742642992" mode="Opaque" x="430" y="0" width="70" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="278d45a8-fc86-4ceb-af8b-80d742642992" mode="Opaque" x="510" y="0" width="70" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -240,13 +251,13 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="0fe97816-bfbe-432e-8a78-2560fc65f4d6" mode="Opaque" x="500" y="0" width="70" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="0fe97816-bfbe-432e-8a78-2560fc65f4d6" mode="Opaque" x="580" y="0" width="70" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -255,13 +266,13 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total4}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d97d7e8e-60fd-421e-9e6f-4ad099ffd1ec" mode="Opaque" x="570" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="d97d7e8e-60fd-421e-9e6f-4ad099ffd1ec" mode="Opaque" x="650" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -270,13 +281,13 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tatal5}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b83daed1-e24f-49a7-a79f-0841e3c91f53" mode="Opaque" x="650" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="b83daed1-e24f-49a7-a79f-0841e3c91f53" mode="Opaque" x="730" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -285,13 +296,13 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total6}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8f5ba9f4-fe4d-40b4-9614-b0c1377a7f3a" mode="Opaque" x="730" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="8f5ba9f4-fe4d-40b4-9614-b0c1377a7f3a" mode="Opaque" x="810" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -300,13 +311,13 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total7}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="02cdd91d-dc60-44f1-aa4b-345a42d723b8" mode="Opaque" x="810" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="02cdd91d-dc60-44f1-aa4b-345a42d723b8" mode="Opaque" x="890" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -315,13 +326,13 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total8}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="04dacf11-4a2d-4c44-ba94-25e320a8ccec" mode="Opaque" x="890" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="04dacf11-4a2d-4c44-ba94-25e320a8ccec" mode="Opaque" x="970" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -330,11 +341,41 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total9}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="4936388e-7552-4858-9a42-7580d4e3abc6" mode="Opaque" x="90" y="0" width="180" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<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" rotation="None" markup="none">
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{total0}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="4936388e-7552-4858-9a42-7580d4e3abc6" mode="Opaque" x="270" y="0" width="80" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
+				<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" rotation="None" markup="none">
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{total1}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
===================================================================
diff -u -r19137 -r19224
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js	(.../tousseWorkLoadView.js)	(revision 19137)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js	(.../tousseWorkLoadView.js)	(revision 19224)
@@ -16,6 +16,7 @@
 	var endTime = $Id('endTime').value;
 	var departCoding = Ext.getCmp('querySupplyRoom').getValue();
 	var tousseTypes = $Id('tousseType').value;
+	var operator = $Id('operator').value;
 	myMask = new Ext.LoadMask(Ext.getBody(), {
 		msg: '正在加载，请稍候！',
 		removeMask: true
@@ -26,7 +27,8 @@
 			"&startDay=" + startTime +
 			"&endDay=" + endTime +
 			"&departCoding=" + departCoding +
-			"&tousseTypes=" + tousseTypes,
+			"&tousseTypes=" + tousseTypes +
+			"&operator=" + operator,
 			'thisIframe', '_self');
 }
 
@@ -45,6 +47,30 @@
 		data : [[ALL],[INSIDE],[DRESSING],[DISINFECTION],[FOREIGNPROXY],[FOREIGN],[CUSTOM]]
 	});
 	
+	//人员
+	var readerDetail = Ext.data.Record.create([{
+		name : 'id'
+	}, {
+		name : 'name'
+	} ]);
+	var userJsonStore = new Ext.data.Store({
+		autoLoad : false,
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/systemmanage/user/loadUserByDepartmentCode!loadUserByDepartmentCode.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			root : 'data',
+			totalProperty : 'totalCount'
+		},readerDetail),
+		listeners : {
+			beforeload : function(_this, options) {
+				_this.baseParams.needAll = 'yes';
+				_this.baseParams.departmentCode = Ext.getCmp('querySupplyRoom').getValue();
+			}
+		}
+	});
+	
 	form = new Ext.form.FormPanel({
 		title : entityName,
 		region : 'north',
@@ -142,7 +168,11 @@
 					listeners : {
 						render : function(_this) {
 							supplyRoomStore.load();
-						} 
+						},
+						select : function() {
+							userJsonStore.reload();
+							Ext.getCmp('operator').setValue('');
+						}
 					}
 				}]
 			},{
@@ -163,6 +193,30 @@
 					value : ALL,
 					anchor : '95%'
 				}]
+			},{
+				layout:'form',
+				width:200,
+				labelWidth:50,
+				items:[{
+					xtype : 'combo',
+					id : 'operator',
+					name : 'operator',
+					queryParam : 'spell',
+					fieldLabel : '人员',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					store : userJsonStore,
+					pageSize : 50,
+					forceSelection : true,
+					lazyInit : true,
+					anchor : '95%',
+					listWidth:300,
+					triggerAction : 'all',
+//					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true
+				}]
 			}]
 		}],
 		buttons:[{
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseWorkLoadChildVO.java
===================================================================
diff -u -r17527 -r19224
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseWorkLoadChildVO.java	(.../TousseWorkLoadChildVO.java)	(revision 17527)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseWorkLoadChildVO.java	(.../TousseWorkLoadChildVO.java)	(revision 19224)
@@ -24,6 +24,11 @@
 	private Integer recycleAmount = 0;
 	
 	/**
+	 * 清点数量
+	 */
+	private Integer inventoryAmount = 0;
+	
+	/**
 	 * 清洗数量
 	 */
 	private Integer washAmount = 0;
@@ -137,4 +142,12 @@
 	public void setSignAmount(Integer signAmount) {
 		this.signAmount = signAmount;
 	}
+
+	public Integer getInventoryAmount() {
+		return inventoryAmount;
+	}
+
+	public void setInventoryAmount(Integer inventoryAmount) {
+		this.inventoryAmount = inventoryAmount;
+	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r19197 -r19224
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 19197)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 19224)
@@ -802,9 +802,10 @@
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
 			String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
 			String tousseTypes = StrutsParamUtils.getPraramValue("tousseTypes", "");
+			String operator = StrutsParamUtils.getPraramValue("operator", "");
 			if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)
 					&& StringUtils.isNotBlank(departCoding)){
-				return jasperReportManager.getTousseWorkLoadData(startDay,endDay,departCoding,tousseTypes);
+				return jasperReportManager.getTousseWorkLoadData(startDay,endDay,departCoding,tousseTypes, operator);
 			}
 		}else if(reportName.equals("apparatusInfusionisType")){
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r19197 -r19224
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 19197)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 19224)
@@ -347,13 +347,16 @@
 	public List<SterilizingStove_child> getSterilizingStoveUseCountDetailData(String startTime,String endTime,String depart,String departCoding,String sterilizationPurpose);
 	/**
 	 * 获取器械包工作量统计报表的数据
-	 * @param startTime	开始时间格式如：2017-01-01
-	 * @param endTime	结束时间格式如：2017-01-01
+	 * @param startTime		开始时间格式如：2017-01-01
+	 * @param endTime		结束时间格式如：2017-01-01
 	 * @param departCoding	供应室编码
 	 * @param tousseTypes	器械包类型
+	 * @param operator		操作人
 	 * @return
 	 */
-	public List<TousseWorkLoadVO> getTousseWorkLoadData(String startTime,String endTime,String departCoding, String tousseTypes);
+	public List<TousseWorkLoadVO> getTousseWorkLoadData(
+			String startTime,String endTime,
+			String departCoding,String tousseTypes, String operator);
 	
 	public List<ApparatusInfusionisType> getApparatusInfusionis(String startDay,String endDay,String departCoding,String showDetail);
 
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r19208 -r19224
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19208)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19224)
@@ -10523,7 +10523,7 @@
 
 	@Override
 	public List<TousseWorkLoadVO> getTousseWorkLoadData(String startTime,
-			String endTime, String departCoding, String tousseTypes) {
+			String endTime, String departCoding, String tousseTypes, String operator) {
 		long ll = System.currentTimeMillis();
 		if(StringUtils.isNotBlank(startTime) && startTime.trim().length() == 16){
 			startTime = startTime + ":00";
@@ -10562,118 +10562,142 @@
 		
 		//申请数量（按包统计）
 		String sql = String.format("select 'application' as type,ti.tousseName,sum(ti.amount),ti.tousseType from invoicePlan ip,TousseItem ti "
-				+" where ti.recyclingApplication_ID=ip.id and ip.handleDepartCoding = '%s' and ip.applicationTime between %s and %s and ti.tousseType<>'一次性物品' group by ti.tousseType,ti.tousseName "
+				+" where ti.recyclingApplication_ID=ip.id and ip.handleDepartCoding = '%s' and ip.applicationTime between %s and %s and ti.tousseType<>'一次性物品' "
+				+ "%s group by ti.tousseType,ti.tousseName "
 				+ "having(ti.tousseType %s)", 
-				departCoding,startDateSql,endDateSql,tousseTypeSql);
+				departCoding,startDateSql,endDateSql,getAndSql("ip.applicant", operator),tousseTypeSql);
 		
 		//回收数量（按包统计）
 		sql	+= " union all ";
 		sql += String.format("select 'recyc' as type,ti.tousseName,sum(ti.amount),ti.tousseType from recyclingRecord rr,RecyclingItem ti "
-				+" where rr.id = ti.recyclingRecord_id and rr.orgUnitCoding = '%s' and rr.recyclingTime between %s and %s group by ti.tousseType,ti.tousseName "
+				+" where rr.id = ti.recyclingRecord_id and rr.orgUnitCoding = '%s' and rr.recyclingTime between %s and %s "
+				+ "%s group by ti.tousseType,ti.tousseName "
 				+ "having(ti.tousseType %s)",
-				departCoding,startDateSql,endDateSql,tousseTypeSql);
+				departCoding,startDateSql,endDateSql,getAndSql("rr.recyclingUser", operator),tousseTypeSql);
 		
+		//清点数量（按包统计）
+		sql	+= " union all ";
+		sql += String.format("select 'inventory' as type,ti.tousseName,sum(ti.amount),ti.tousseType from recyclingRecord rr,RecyclingItem ti "
+				+" where rr.id = ti.recyclingRecord_id and rr.orgUnitCoding = '%s' and rr.recyclingTime between %s and %s "
+				+ "%s group by ti.tousseType,ti.tousseName "
+				+ "having(ti.tousseType %s)",
+				departCoding,startDateSql,endDateSql,getAndSql("rr.operator", operator),tousseTypeSql);
+		
 		//清洗数量（按包统计）
 		sql	+= " union all ";
 		sql += String.format("select 'wash' as type,tmp.tousseName,sum(tmp.tousseAmount),tmp.tousseType from ("
-				+ "select ci.name as tousseName,sum(ci.amount) as tousseAmount,min(ci.itemType) as tousseType from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci "
+				+ "select ci.name as tousseName,ci.amount as tousseAmount,ci.itemType as tousseType,"
+				+ "case when (cb.personInCharge is null or cb.personInCharge = '') then wdr.operator else cb.personInCharge end userName "
+				+ "from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci "
 				+ "where wdr.id = cw.WashAndDisinfectRecord_ID  and cw.ClassifyBasket_ID = cb.id and cb.id = ci.classifybasket_id and ci.itemType != '材料' "
-				+ "and wdr.orgUnitCoding = '%s' and wdr.endDate between %s and %s and wdr.washMaterialAmount<>0 group by ci.name "
+				+ "and wdr.orgUnitCoding = '%s' and wdr.endDate between %s and %s and wdr.washMaterialAmount<>0 "
 				+ " union all "
-				+ "select min(ci.tousseNameForMaterial) as tousseName,min(ci.tousseAmountForMaterial) as tousseAmount,min(td.tousseType) as tousseType from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,TousseDefinition td "
+				+ "select min(ci.tousseNameForMaterial) as tousseName,min(ci.tousseAmountForMaterial) as tousseAmount,min(td.tousseType) as tousseType,"
+				+ "case when (min(cb.personInCharge) is null or min(cb.personInCharge) = '') then min(wdr.operator) else min(cb.personInCharge) end userName "
+				+ "from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,TousseDefinition td "
 				+ "where wdr.id = cw.WashAndDisinfectRecord_ID  and cw.ClassifyBasket_ID = cb.id and cb.id = ci.classifybasket_id and ci.tousseDefinitionID=td.id and ci.itemType = '材料' "
-				+ "and wdr.orgUnitCoding = '%s' and wdr.endDate between %s and %s and wdr.washMaterialAmount<>0 group by ci.tousseDefinitionID,ci.recyclingRecordId) tmp "
-				+ "group by tmp.tousseType,tmp.tousseName having(tmp.tousseType %s)",
-				departCoding,startDateSql,endDateSql,departCoding,startDateSql,endDateSql,tousseTypeSql);
+				+ "and wdr.orgUnitCoding = '%s' and wdr.endDate between %s and %s and wdr.washMaterialAmount<>0 group by ci.tousseDefinitionID,ci.recyclingRecordId"
+				+ ") tmp where 1=1 %s group by tmp.tousseType,tmp.tousseName having(tmp.tousseType %s)",
+				departCoding,startDateSql,endDateSql,departCoding,startDateSql,endDateSql,getAndSql("tmp.userName", operator),tousseTypeSql);
 		
 		//清洗数量（按材料统计）
 		sql	+= " union all ";
 		sql += String.format("select 'wash-material' as type,tmp.tousseName,sum(tmp.tousseAmount),tmp.tousseType from ("
-				+ "select min(td.name) as tousseName,sum(ci.amount * ms.count) as tousseAmount,min(td.tousseType) as tousseType from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,tousseDefinition td,materialInstance ms "
+				+ "select td.name as tousseName,ci.amount * ms.count as tousseAmount,td.tousseType as tousseType,"
+				+ "case when (cb.personInCharge is null or cb.personInCharge = '') then wdr.operator else cb.personInCharge end userName "
+				+ "from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,tousseDefinition td,materialInstance ms "
 				+ "where wdr.id = cw.WashAndDisinfectRecord_ID  and cw.ClassifyBasket_ID = cb.id and cb.id = ci.classifybasket_id and ci.toussedefinition_id = td.id and td.id = ms.tousse_id "
-				+ "and wdr.orgUnitCoding = '%s' and wdr.endDate between %s and %s and wdr.washMaterialAmount<>0 group by ci.toussedefinition_id "
+				+ "and wdr.orgUnitCoding = '%s' and wdr.endDate between %s and %s and wdr.washMaterialAmount<>0 "
 				+ " union all "
-				+ "select min(ci.tousseNameForMaterial) as tousseName,sum(ci.amount) as tousseAmount,min(td.tousseType) as tousseType from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,tousseDefinition td "
+				+ "select ci.tousseNameForMaterial as tousseName,ci.amount as tousseAmount,td.tousseType as tousseType,"
+				+ "case when (cb.personInCharge is null or cb.personInCharge = '') then wdr.operator else cb.personInCharge end userName "
+				+ "from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,tousseDefinition td "
 				+ "where wdr.id = cw.WashAndDisinfectRecord_ID  and cw.ClassifyBasket_ID = cb.id and cb.id = ci.classifybasket_id and ci.tousseDefinitionID=td.id and ci.itemType = '材料' "
-				+ "and wdr.orgUnitCoding = '%s' and wdr.endDate between %s and %s and wdr.washMaterialAmount<>0 group by ci.tousseDefinitionID) tmp "
-				+ "group by tmp.tousseType,tmp.tousseName having(tmp.tousseType %s)",
-				departCoding,startDateSql,endDateSql,departCoding,startDateSql,endDateSql,tousseTypeSql);
+				+ "and wdr.orgUnitCoding = '%s' and wdr.endDate between %s and %s and wdr.washMaterialAmount<>0 "
+				+ ") tmp where 1=1 %s group by tmp.tousseType,tmp.tousseName having(tmp.tousseType %s)",
+				departCoding,startDateSql,endDateSql,departCoding,startDateSql,endDateSql,getAndSql("tmp.userName", operator),tousseTypeSql);
 		
 		//装配数量（按包统计）
 		sql	+= " union all ";
 		sql	+= String.format("select 'packing' as type,pr.tousseName,sum(pr.amount),pr.tousseType from PackingRecord pr "
-				+" where pr.orgUnitCoding = '%s' and pr.packTime between %s and %s group by pr.tousseType,pr.tousseName having(pr.tousseType %s) ", 
-				departCoding,startDateSql,endDateSql,tousseTypeSql);
+				+" where pr.orgUnitCoding = '%s' and pr.packTime between %s and %s "
+				+ "%s group by pr.tousseType,pr.tousseName having(pr.tousseType %s) ", 
+				departCoding,startDateSql,endDateSql,getAndSql("pr.packer", operator),tousseTypeSql);
 		
 		//审核数量（按包统计）
 		sql	+= " union all ";
 		sql += String.format("select 'review' as type,t.tousseName,count(*),td.tousseType from TousseInstance t,TousseDefinition td  "
-				+" where t.tousseDefinition_id=td.id and t.orgUnitCoding = '%s' and t.reviewTime between %s and %s and t.foreignTousseApp_id is null group by td.tousseType,t.tousseName "
-				+ "having(td.tousseType %s) ",
-				departCoding,startDateSql,endDateSql,tousseTypeSql);
+				+" where t.tousseDefinition_id=td.id and t.orgUnitCoding = '%s' and t.reviewTime between %s and %s and t.foreignTousseApp_id is null "
+				+ "%s group by td.tousseType,t.tousseName having(td.tousseType %s) ",
+				departCoding,startDateSql,endDateSql,getAndSql("t.reviewer", operator),tousseTypeSql);
 		if (includeForeignTousse) {
 			sql	+= " union all ";
 			sql += String.format("select 'review' as type,fta.tousseName,count(*),'外来器械包' from TousseInstance t,ForeignTousseApplication fta "
-					+" where t.foreignTousseApp_id=fta.id and t.orgUnitCoding = '%s' and t.reviewTime between %s and %s group by fta.tousseName ",
-					departCoding,startDateSql,endDateSql);
+					+" where t.foreignTousseApp_id=fta.id and t.orgUnitCoding = '%s' and t.reviewTime between %s and %s "
+					+ "%s group by fta.tousseName ",
+					departCoding,startDateSql,endDateSql,getAndSql("t.reviewer", operator));
 		}
 		
 		//灭菌数量（按包统计）
 		sql	+= " union all ";
 		sql += String.format("select 'sterilization' as type,ti.tousseName,count(*),td.tousseType from SterilizationRecord sr,sterilization_tousseInstance st,TousseInstance ti,TousseDefinition td "
 				+" where sr.id = st.sterilizationRecord_id and st.tousseInstance_id = ti.id and ti.tousseDefinition_id=td.id "
-				+" and sr.orgUnitCoding = '%s' and sr.endDate between %s and %s and ti.foreignTousseApp_id is null group by td.tousseType,ti.tousseName "
+				+" and sr.orgUnitCoding = '%s' and sr.endDate between %s and %s and ti.foreignTousseApp_id is null "
+				+ "%s group by td.tousseType,ti.tousseName "
 				+ "having(td.tousseType %s) ",
-				departCoding,startDateSql,endDateSql,tousseTypeSql);
+				departCoding,startDateSql,endDateSql,getAndSql("sr.sterilizationUser", operator),tousseTypeSql);
 		if (includeForeignTousse) {
 			sql	+= " union all ";
 			sql += String.format("select 'sterilization' as type,fta.tousseName,count(*),'外来器械包' from SterilizationRecord sr,sterilization_tousseInstance st,TousseInstance ti,ForeignTousseApplication fta "
 					+" where sr.id = st.sterilizationRecord_id and st.tousseInstance_id = ti.id and ti.foreignTousseApp_id=fta.id "
-					+" and sr.orgUnitCoding = '%s' and sr.endDate between %s and %s group by fta.tousseName ",
-					departCoding,startDateSql,endDateSql);
+					+" and sr.orgUnitCoding = '%s' and sr.endDate between %s and %s "
+					+ "%s group by fta.tousseName ",
+					departCoding,startDateSql,endDateSql,getAndSql("sr.sterilizationUser", operator));
 		}
 		
 		sql	+= " union all ";
 		sql += String.format("select 'sterilization' as type,ti.tousseName,count(*),td.tousseType from SterilizationRecord sr,sterilization_reviewed sre,ReviewedBasket rb,TousseInstance ti,TousseDefinition td "
 				+" where sr.id = sre.sterilizationRecord_id and sre.reviewedBasket_id = rb.id and rb.id = ti.reviewBasket_ID and ti.tousseDefinition_id=td.id "
-				+" and sr.orgUnitCoding = '%s' and sr.endDate between %s and %s and ti.foreignTousseApp_id is null group by td.tousseType,ti.tousseName "
-				+ "having(td.tousseType %s) ",
-				departCoding,startDateSql,endDateSql,tousseTypeSql);
+				+" and sr.orgUnitCoding = '%s' and sr.endDate between %s and %s and ti.foreignTousseApp_id is null "
+				+ "%s group by td.tousseType,ti.tousseName having(td.tousseType %s) ",
+				departCoding,startDateSql,endDateSql,getAndSql("sr.sterilizationUser", operator),tousseTypeSql);
 		if (includeForeignTousse) {
 			sql	+= " union all ";
 			sql += String.format("select 'sterilization' as type,fta.tousseName,count(*),'外来器械包' from SterilizationRecord sr,sterilization_reviewed sre,ReviewedBasket rb,TousseInstance ti,ForeignTousseApplication fta "
 					+" where sr.id = sre.sterilizationRecord_id and sre.reviewedBasket_id = rb.id and rb.id = ti.reviewBasket_ID and ti.foreignTousseApp_id=fta.id "
-					+" and sr.orgUnitCoding = '%s' and sr.endDate between %s and %s group by fta.tousseName ",
-					departCoding,startDateSql,endDateSql);
+					+" and sr.orgUnitCoding = '%s' and sr.endDate between %s and %s "
+					+ "%s group by fta.tousseName ",
+					departCoding,startDateSql,endDateSql,getAndSql("sr.sterilizationUser", operator));
 		}
 		
 		//发货数量（按包统计）
 		sql	+= " union all ";
 		sql += String.format("select 'invoice' as type,ii.tousseName,sum(ii.amount) amount,ii.tousseType from Invoice i join InvoiceItem ii on ii.invoice_id=i.id "
 				+ "where i.orgUnitCoding = '%s' and ii.diposable='否' and i.sendTime between %s and %s "
 				+ "and not exists(select 1 from ForeignTousseApplication fta where fta.id=i.invoicePlan_ID) "
-				+ "group by ii.tousseType,ii.tousseName having(ii.tousseType %s) ",
-				departCoding,startDateSql,endDateSql,tousseTypeSql);
+				+ "%s group by ii.tousseType,ii.tousseName having(ii.tousseType %s) ",
+				departCoding,startDateSql,endDateSql,getAndSql("i.sender", operator),tousseTypeSql);
 		if (includeForeignTousse) {
 			sql	+= " union all ";
 			sql += String.format("select 'invoice' type,fta.tousseName,sum(ii.amount) amount,'外来器械包' tousseType from invoice i join InvoiceItem ii on ii.invoice_id=i.id "
 					+ "join ForeignTousseApplication fta on fta.id=i.invoicePlan_ID "
-					+" where i.orgUnitCoding = '%s' and i.sendTime between %s and %s group by fta.tousseName",
-					departCoding,startDateSql,endDateSql);
+					+" where i.orgUnitCoding = '%s' and i.sendTime between %s and %s "
+					+ "%s group by fta.tousseName",
+					departCoding,startDateSql,endDateSql,getAndSql("i.sender", operator));
 		}
 		
 		//签收数量（按包统计）
 		sql	+= " union all ";
 		sql += String.format("select 'signed' as type,ti.tousseName,count(*),td.tousseType from TousseInstance ti,TousseDefinition td "
-				+" where ti.tousseDefinition_id=td.id and ti.orgUnitCoding = '%s' and %s between %s and %s and ti.foreignTousseApp_id is null group by td.tousseType,ti.tousseName "
-				+ "having(td.tousseType %s) ",
-				departCoding,signedTimeString,startDateSql,endDateSql,tousseTypeSql);
+				+" where ti.tousseDefinition_id=td.id and ti.orgUnitCoding = '%s' and %s between %s and %s and ti.foreignTousseApp_id is null "
+				+ "%s group by td.tousseType,ti.tousseName having(td.tousseType %s) ",
+				departCoding,signedTimeString,startDateSql,endDateSql,getAndSql("ti.signedUser", operator),tousseTypeSql);
 		if (includeForeignTousse) {
 			sql	+= " union all ";
 			sql += String.format("select 'signed' as type,fta.tousseName,count(*),'外来器械包' from TousseInstance ti,ForeignTousseApplication fta "
 					+" where ti.foreignTousseApp_id=fta.id "
-					+" and ti.orgUnitCoding = '%s' and %s between %s and %s group by fta.tousseName ",
-					departCoding,signedTimeString,startDateSql,endDateSql);
+					+" and ti.orgUnitCoding = '%s' and %s between %s and %s %s group by fta.tousseName ",
+					departCoding,signedTimeString,startDateSql,endDateSql,getAndSql("ti.signedUser", operator));
 		}
 		
 		Map<String, HashMap<String, TousseWorkLoadChildVO>> typeOfChild = new HashMap<String, HashMap<String, TousseWorkLoadChildVO>>();
@@ -10761,6 +10785,22 @@
 		logger.debug("器械包工作量统计报表后台查询时间：" + (System.currentTimeMillis() - ll) + "毫秒");
 		return list;
 	}
+	
+	/**
+	 * 获取各个环节的操作人的过滤sql语句（注意：测方法只是用于本类的getTousseWorkLoadData方法用）
+	 * @param field	操作人属性名称
+	 * @param value	操作人属性值
+	 * @return
+	 */
+	private String getAndSql(String field, String value) {
+		String andSql = "";
+		if (StringTools.isNotBlank(field)
+				&& StringTools.isNotBlank(value)
+				&& !"全部".equals(value)) {
+			andSql = String.format("and %s='%s'", field, value);
+		}
+		return andSql;
+	}
 
 	/**
 	 * 给器械包工作量统计报表的javaBean设值（注意：此方法只适应本类的getTousseWorkLoadData方法调用，其他地方别用）
@@ -10774,6 +10814,8 @@
 			childVO.setApplicationAmount(childVO.getApplicationAmount()+amount);
 		}else if("recyc".equals(type)){
 			childVO.setRecycleAmount(childVO.getRecycleAmount()+amount);
+		}else if("inventory".equals(type)){
+			childVO.setInventoryAmount(childVO.getInventoryAmount()+amount);
 		}else if("wash".equals(type)){
 			childVO.setWashAmount(childVO.getWashAmount()+amount);
 		}else if("wash-material".equals(type)){
Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
===================================================================
diff -u -r18183 -r19224
Binary files differ
Index: forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
===================================================================
diff -u -r17612 -r19224
--- forgon-core/src/main/java/com/forgon/directory/action/UserAction.java	(.../UserAction.java)	(revision 17612)
+++ forgon-core/src/main/java/com/forgon/directory/action/UserAction.java	(.../UserAction.java)	(revision 19224)
@@ -14,6 +14,7 @@
 import net.sf.json.JsonConfig;
 import net.sf.json.util.PropertyFilter;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
@@ -317,6 +318,8 @@
 			likeSql += " or u.wbCode like '%"+spell.toUpperCase() +"%')";
 		}
 		
+		//需不需要一个“全部”的标识
+		String needAll = StrutsParamUtils.getPraramValue("needAll", "");
 		String departmentCode = StrutsParamUtils.getPraramValue("departmentCode", "");
 		String departmentCodeSql = "";
 		if(StringUtils.isNotBlank(departmentCode) && !"-1".equals(departmentCode)){
@@ -342,6 +345,13 @@
 		}finally {
 			DatabaseUtil.closeResultSetAndStatement(result);
 		}
+		
+		if ("yes".equals(needAll) && CollectionUtils.isNotEmpty(list)) {
+			Map<String, Object> map = new HashMap<String, Object>();
+			map.put("id", -1);
+			map.put("name", "全部");
+			list.add(0, map);
+		}
 		PageEntity pe= PageUtil.getPagePara();
 		PageUtil.outPutResult(pe, list);
 	}
Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jasper
===================================================================
diff -u -r17578 -r19224
Binary files differ