Index: ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml
===================================================================
diff -u -r27029 -r27617
--- ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml	(.../materialDamageItemView.jrxml)	(revision 27029)
+++ ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml	(.../materialDamageItemView.jrxml)	(revision 27617)
@@ -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="1050" pageHeight="815" columnWidth="1050" 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="1103" pageHeight="815" columnWidth="1103" 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"/>
@@ -58,7 +58,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="1058aff5-20f1-45b4-9335-b49559949f8d" x="23" y="0" width="980" height="30"/>
+				<reportElement uuid="1058aff5-20f1-45b4-9335-b49559949f8d" x="0" y="0" width="1103" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -83,70 +83,70 @@
 				<text><![CDATA[报损人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="e893b019-fcc5-4f5a-88b7-efbbcd68b962" style="table_TH" x="193" y="0" width="120" height="35"/>
+				<reportElement uuid="e893b019-fcc5-4f5a-88b7-efbbcd68b962" style="table_TH" x="193" y="0" width="130" 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="313" y="0" width="150" height="35"/>
+				<reportElement uuid="ffda6fce-5225-4729-af3a-ffed93397e7a" style="table_TH" x="323" y="0" width="150" 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="463" y="0" width="70" height="35"/>
+				<reportElement uuid="bd5e1793-a45b-4eca-8551-007a8f6b10f3" style="table_TH" x="473" y="0" width="70" 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="533" y="0" width="70" height="35"/>
+				<reportElement uuid="4e73322f-3e44-491a-9028-46d7cceba096" style="table_TH" x="543" y="0" width="70" 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="603" y="0" width="80" height="35"/>
+				<reportElement uuid="4e73322f-3e44-491a-9028-46d7cceba096" style="table_TH" x="613" y="0" width="80" 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="683" y="0" width="80" height="35"/>
+				<reportElement uuid="4e73322f-3e44-491a-9028-46d7cceba096" style="table_TH" x="693" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[医生]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="e893b019-fcc5-4f5a-88b7-efbbcd68b962" style="table_TH" x="763" y="0" width="120" height="35"/>
+				<reportElement uuid="e893b019-fcc5-4f5a-88b7-efbbcd68b962" style="table_TH" x="773" y="0" width="120" 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="953" y="0" width="70" height="35"/>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="963" y="0" width="70" 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="883" y="0" width="70" height="35"/>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="893" y="0" width="70" 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="1023" y="0" width="70" height="35"/>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="1033" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -171,12 +171,12 @@
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
 			<subreport isUsingCache="false">
-				<reportElement uuid="43c8e776-4407-4359-a99b-1546c515bbdc" x="123" y="0" width="760" height="30"/>
+				<reportElement uuid="43c8e776-4407-4359-a99b-1546c515bbdc" x="123" y="0" width="770" 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="953" y="0" width="70" height="30"/>
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="963" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -190,7 +190,7 @@
 				<textFieldExpression><![CDATA[$F{rate}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0" isBlankWhenNull="true">
-				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="883" y="0" width="70" height="30"/>
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="893" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -204,7 +204,7 @@
 				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="1023" y="0" width="70" height="30"/>
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="1033" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -222,28 +222,28 @@
 	<summary>
 		<band height="31">
 			<staticText>
-				<reportElement uuid="2de98dcc-e086-470a-88c3-efa3af5874e3" style="table_CH" x="0" y="0" width="883" height="30"/>
+				<reportElement uuid="2de98dcc-e086-470a-88c3-efa3af5874e3" style="table_CH" x="0" y="0" width="893" 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="883" y="0" width="70" height="30"/>
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="893" y="0" width="70" 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="1023" y="0" width="70" height="30"/>
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="1033" y="0" width="70" 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="953" y="0" width="70" height="30"/>
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="963" y="0" width="70" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>