Index: ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jrxml
===================================================================
diff -u -r28075 -r32411
--- ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jrxml	(.../EOGoods_main_1.jrxml)	(revision 28075)
+++ ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jrxml	(.../EOGoods_main_1.jrxml)	(revision 32411)
@@ -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="monthDetail_main_1" language="groovy" pageWidth="650" pageHeight="750" whenNoDataType="AllSectionsNoDetail" columnWidth="650" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
+<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="monthDetail_main_1" language="groovy" pageWidth="904" pageHeight="750" whenNoDataType="AllSectionsNoDetail" columnWidth="904" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -33,12 +33,23 @@
 	</parameter>
 	<parameter name="sterilisations" class="java.lang.String"/>
 	<queryString>
-		<![CDATA[select i.depart,sum(t.fluctuationPrice) as totalPrice from invoice i,TousseInstance t
+		<![CDATA[select i.depart,sum(t.fluctuationPrice) as totalPrice,sum(t.statisticsAmount) as totalAmount,sum(t.materialAmount) as totalMaterialAmount from invoice i,TousseInstance t
  where i.id = t.invoice_id and (i.status = '已发货' or i.status = '收货签收')
  $P!{sql} group by i.depart]]>
 	</queryString>
 	<field name="DEPART" class="java.lang.String"/>
+	<field name="TOTALAMOUNT" class="java.math.BigDecimal"/>
+	<field name="TOTALMATERIALAMOUNT" class="java.math.BigDecimal"/>
 	<field name="TOTALPRICE" class="java.math.BigDecimal"/>
+	<variable name="sumTotalAmount" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{TOTALAMOUNT}]]></variableExpression>
+	</variable>
+	<variable name="sumTotalMaterialAmount" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{TOTALMATERIALAMOUNT}]]></variableExpression>
+	</variable>
+	<variable name="sumTotalPrice" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{TOTALPRICE}]]></variableExpression>
+	</variable>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -56,17 +67,17 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
-				<text><![CDATA[数量]]></text>
+				<text><![CDATA[包数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="403" y="90" width="80" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="483" y="90" width="80" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[单价(元)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="483" y="90" width="80" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="563" y="90" width="80" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -80,26 +91,47 @@
 				<text><![CDATA[科室]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="650" height="30"/>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="904" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="30" width="904" height="60"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{sterilisations}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="563" y="90" width="87" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="817" y="90" width="87" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[总价(元)]]></text>
 			</staticText>
-			<textField>
-				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="30" width="650" height="60"/>
+			<staticText>
+				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="643" y="90" width="87" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="14" isBold="false"/>
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{sterilisations}]]></textFieldExpression>
-			</textField>
+				<text><![CDATA[科室总包数]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="730" y="90" width="87" height="30" backcolor="#D9EEDE"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[科室总材料数]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="403" y="90" width="80" height="30" backcolor="#D9EEDE"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[材料数量]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -112,7 +144,7 @@
 				<textFieldExpression><![CDATA[$F{DEPART}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" x="112" y="0" width="451" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" x="112" y="0" width="531" height="30" isPrintWhenDetailOverflows="true"/>
 				<subreportParameter name="depart">
 					<subreportParameterExpression><![CDATA[$F{DEPART}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -123,12 +155,33 @@
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "EOGoods_child_1.jasper"]]></subreportExpression>
 			</subreport>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement uuid="b2b1b7cc-bf59-46d0-80c2-0208194458d1" style="table_TD" stretchType="RelativeToBandHeight" x="563" y="0" width="87" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="b2b1b7cc-bf59-46d0-80c2-0208194458d1" style="table_TD" stretchType="RelativeToBandHeight" x="817" y="0" width="87" height="30" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{TOTALPRICE}==null?"0.00":$F{TOTALPRICE}]]></textFieldExpression>
 			</textField>
+			<textField pattern="###0.00;-###0.00">
+				<reportElement uuid="b2b1b7cc-bf59-46d0-80c2-0208194458d1" style="table_TD" stretchType="RelativeToBandHeight" x="643" y="0" width="87" height="30" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{TOTALPRICE}==null?"0.00":$F{TOTALPRICE}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0;-###0">
+				<reportElement uuid="b2b1b7cc-bf59-46d0-80c2-0208194458d1" style="table_TD" stretchType="RelativeToBandHeight" x="643" y="0" width="87" height="30" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{TOTALAMOUNT}==null?"0":$F{TOTALAMOUNT}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0;-###0">
+				<reportElement uuid="b2b1b7cc-bf59-46d0-80c2-0208194458d1" style="table_TD" stretchType="RelativeToBandHeight" x="730" y="0" width="87" height="30" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{TOTALMATERIALAMOUNT}==null?"0":$F{TOTALMATERIALAMOUNT}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
@@ -137,26 +190,100 @@
 	<pageFooter>
 		<band height="20">
 			<textField>
-				<reportElement uuid="99b6c86e-7a7f-42a7-8b73-f10bd36aac1f" x="0" y="0" width="483" height="20"/>
+				<reportElement uuid="99b6c86e-7a7f-42a7-8b73-f10bd36aac1f" x="1" y="0" width="729" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="156af036-3af3-4aa5-895a-6fe6c83dc9e4" x="483" y="0" width="80" height="20"/>
+				<reportElement uuid="156af036-3af3-4aa5-895a-6fe6c83dc9e4" x="730" y="0" width="88" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["第 "+$V{PAGE_NUMBER}+" 页"]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="">
-				<reportElement uuid="4002a98f-14e0-4d97-a485-31cdc1ed6f69" x="563" y="0" width="87" height="20"/>
+				<reportElement uuid="4002a98f-14e0-4d97-a485-31cdc1ed6f69" x="817" y="0" width="87" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["共 "+$V{PAGE_NUMBER}+" 页"]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageFooter>
+	<summary>
+		<band height="50">
+			<staticText>
+				<reportElement uuid="8957cb38-42a8-4ed6-b50b-1f8d29579736" x="0" y="0" width="112" height="30"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[合计]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="e6707e73-448f-46fd-854a-e815868a3ccb" x="112" y="0" width="531" height="30"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[]]></text>
+			</staticText>
+			<textField isStretchWithOverflow="true" pattern="###0;-###0">
+				<reportElement uuid="93aafb34-c81c-4388-8103-56f1c84e2c33" x="643" y="0" width="87" height="30"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sumTotalAmount}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0;-###0">
+				<reportElement uuid="4829b31f-0aca-4388-b2e0-dac726a89097" x="730" y="0" width="87" height="30"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sumTotalMaterialAmount}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0.00;-###0.00">
+				<reportElement uuid="f3ef9e5e-6119-4eaa-ba88-9750f9782a49" x="817" y="0" width="87" height="30"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sumTotalPrice}]]></textFieldExpression>
+			</textField>
+		</band>
+	</summary>
 </jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/EOGoods_child_1.jasper
===================================================================
diff -u -r27617 -r32411
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/EOGoods_child_1.jrxml
===================================================================
diff -u -r27617 -r32411
--- ssts-web/src/main/webapp/jasperRtp/EOGoods_child_1.jrxml	(.../EOGoods_child_1.jrxml)	(revision 27617)
+++ ssts-web/src/main/webapp/jasperRtp/EOGoods_child_1.jrxml	(.../EOGoods_child_1.jrxml)	(revision 32411)
@@ -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="monthDetail_child_1" language="groovy" pageWidth="451" pageHeight="842" columnWidth="451" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="bd889010-8709-4014-9272-b71cb51c1fd3">
+<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="monthDetail_child_1" language="groovy" pageWidth="531" pageHeight="842" columnWidth="531" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="bd889010-8709-4014-9272-b71cb51c1fd3">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -30,32 +30,33 @@
 	</parameter>
 	<queryString>
 		<![CDATA[select t.toussename as TOUSSENAME,
-sum(t.statisticsAmount)as AMOUNT,t.fluctuationPrice AS PRICE,sum(t.fluctuationPrice) as TOTALPRICE
+count(*) as AMOUNT,sum(t.materialAmount) as MATERIALAMOUNT,t.fluctuationPrice AS PRICE,sum(t.fluctuationPrice) as TOTALPRICE
 from invoice i,TousseInstance t where i.id = t.invoice_id and i.depart = $P{depart}
 and (i.status = '已发货' or i.status = '收货签收') $P!{childSql} group by i.depart,t.tousseName,t.fluctuationPrice]]>
 	</queryString>
 	<field name="TOUSSENAME" class="java.lang.String"/>
 	<field name="AMOUNT" class="java.math.BigDecimal"/>
+	<field name="MATERIALAMOUNT" class="java.math.BigDecimal"/>
 	<field name="PRICE" class="java.lang.Double"/>
 	<field name="TOTALPRICE" class="java.math.BigDecimal"/>
 	<detail>
 		<band height="30" splitType="Stretch">
-			<textField pattern="">
+			<textField pattern="###0;-###0">
 				<reportElement uuid="bc3c7b9d-fdf6-464a-bb40-411a07768cf4" style="table_TD" x="211" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{AMOUNT}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement uuid="a6820dac-289e-4684-a582-f4f80c951f39" style="table_TD" x="291" y="0" width="80" height="30"/>
+				<reportElement uuid="a6820dac-289e-4684-a582-f4f80c951f39" style="table_TD" x="371" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{PRICE}==null?"0.00":$F{PRICE}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="62b8d6e0-efb4-48e0-b6f3-d53d31f5f46c" style="table_TD" x="371" y="0" width="80" height="30"/>
+				<reportElement uuid="62b8d6e0-efb4-48e0-b6f3-d53d31f5f46c" style="table_TD" x="451" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12"/>
 				</textElement>
@@ -68,6 +69,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{TOUSSENAME}.lastIndexOf("_")==-1?$F{TOUSSENAME}:$F{TOUSSENAME}.substring(0,$F{TOUSSENAME}.lastIndexOf("_"))]]></textFieldExpression>
 			</textField>
+			<textField pattern="###0;-###0">
+				<reportElement uuid="bc3c7b9d-fdf6-464a-bb40-411a07768cf4" style="table_TD" x="291" y="0" width="80" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{MATERIALAMOUNT}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jasper
===================================================================
diff -u -r28075 -r32411
Binary files differ