Index: ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml
===================================================================
diff -u -r17125 -r18254
--- ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml	(.../materialDamageItemView.jrxml)	(revision 17125)
+++ ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml	(.../materialDamageItemView.jrxml)	(revision 18254)
@@ -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="materialDamageItemView" language="groovy" pageWidth="780" pageHeight="815" columnWidth="780" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="c9f12c7a-0851-41b7-8072-6cec194765af">
+<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="materialDamageItemView" language="groovy" pageWidth="1050" pageHeight="815" columnWidth="1050" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="c9f12c7a-0851-41b7-8072-6cec194765af">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -31,12 +31,6 @@
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
-	<field name="damageReporter" class="java.lang.String">
-		<fieldDescription><![CDATA[damageReporter]]></fieldDescription>
-	</field>
-	<field name="damageTime" class="java.util.Date">
-		<fieldDescription><![CDATA[damageTime]]></fieldDescription>
-	</field>
 	<field name="depart" class="java.lang.String">
 		<fieldDescription><![CDATA[depart]]></fieldDescription>
 	</field>
@@ -46,16 +40,25 @@
 	<field name="totalPrice" class="java.lang.Double">
 		<fieldDescription><![CDATA[totalPrice]]></fieldDescription>
 	</field>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
+	</field>
+	<field name="rate" class="java.lang.String">
+		<fieldDescription><![CDATA[rate]]></fieldDescription>
+	</field>
 	<variable name="total" class="java.lang.Double" calculation="Sum">
 		<variableExpression><![CDATA[$F{totalPrice}]]></variableExpression>
 	</variable>
+	<variable name="sumAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{amount}]]></variableExpression>
+	</variable>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="1058aff5-20f1-45b4-9335-b49559949f8d" x="0" y="0" width="780" height="30"/>
+				<reportElement uuid="1058aff5-20f1-45b4-9335-b49559949f8d" x="0" y="0" width="980" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -80,38 +83,52 @@
 				<text><![CDATA[报损人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="e893b019-fcc5-4f5a-88b7-efbbcd68b962" style="table_TH" x="230" y="0" width="120" height="35"/>
+				<reportElement uuid="e893b019-fcc5-4f5a-88b7-efbbcd68b962" style="table_TH" x="230" y="0" width="190" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[报损时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffda6fce-5225-4729-af3a-ffed93397e7a" style="table_TH" x="350" y="0" width="130" height="35"/>
+				<reportElement uuid="ffda6fce-5225-4729-af3a-ffed93397e7a" style="table_TH" x="420" y="0" width="130" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[材料名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="bd5e1793-a45b-4eca-8551-007a8f6b10f3" style="table_TH" x="480" y="0" width="100" height="35"/>
+				<reportElement uuid="bd5e1793-a45b-4eca-8551-007a8f6b10f3" style="table_TH" x="550" y="0" width="100" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[材料数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="4e73322f-3e44-491a-9028-46d7cceba096" style="table_TH" x="580" y="0" width="100" height="35"/>
+				<reportElement uuid="4e73322f-3e44-491a-9028-46d7cceba096" style="table_TH" x="650" y="0" width="100" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[材料价格]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="680" y="0" width="100" height="35"/>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="850" y="0" width="100" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
+				<text><![CDATA[科室占比]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="750" y="0" width="100" height="35"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[总数量]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="950" y="0" width="100" height="35"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
 				<text><![CDATA[总金额]]></text>
 			</staticText>
 		</band>
@@ -132,8 +149,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="130" y="0" width="100" height="30"/>
+			<subreport isUsingCache="false">
+				<reportElement uuid="43c8e776-4407-4359-a99b-1546c515bbdc" x="130" y="0" width="620" height="30"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{materialDamageItems})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "materialDamageItemView_subreport.jasper"]]></subreportExpression>
+			</subreport>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="850" y="0" width="100" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -144,10 +166,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{damageReporter}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{rate}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="yyyy-MM-dd HH:mm" isBlankWhenNull="true">
-				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="230" y="0" width="120" height="30"/>
+			<textField pattern="###0" isBlankWhenNull="true">
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="750" y="0" width="100" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -158,15 +180,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{damageTime}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
-			<subreport isUsingCache="false">
-				<reportElement uuid="43c8e776-4407-4359-a99b-1546c515bbdc" x="350" y="0" width="330" height="30"/>
-				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{materialDamageItems})]]></dataSourceExpression>
-				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "materialDamageItemView_subreport.jasper"]]></subreportExpression>
-			</subreport>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="680" y="0" width="100" height="30"/>
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="950" y="0" width="100" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -184,19 +201,33 @@
 	<summary>
 		<band height="31">
 			<staticText>
-				<reportElement uuid="2de98dcc-e086-470a-88c3-efa3af5874e3" style="table_CH" x="0" y="0" width="680" height="30"/>
+				<reportElement uuid="2de98dcc-e086-470a-88c3-efa3af5874e3" style="table_CH" x="0" y="0" width="750" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[总计：]]></text>
 			</staticText>
+			<textField pattern="#,##0">
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="750" y="0" width="100" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sumAmount} == null?0:$V{sumAmount}]]></textFieldExpression>
+			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="680" y="0" width="100" height="30"/>
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="950" y="0" width="100" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total}]]></textFieldExpression>
 			</textField>
+			<textField pattern="#,##0.00">
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="850" y="0" width="100" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[""]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>