Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialErrorDamageReportHelper.java
===================================================================
diff -u -r35879 -r38988
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialErrorDamageReportHelper.java	(.../MaterialErrorDamageReportHelper.java)	(revision 35879)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialErrorDamageReportHelper.java	(.../MaterialErrorDamageReportHelper.java)	(revision 38988)
@@ -424,7 +424,7 @@
 		.append(MaterialErrorDamageDetail.TYPE_DAMAGE)
 		.append("'");
 		String sql = "select * from ( "
-				+" select medd.damageRemark,medd.type,medd.operator,medd.materialName,medd.toussename,medd.operationTime,medd.depart,medd.amount,medd.materialCost "
+				+" select medd.damageRemark,medd.type,medd.operator,medd.materialName,ri.toussename,medd.operationTime,medd.depart,medd.amount,medd.materialCost "
 				+" ,ur.circuitNurse,ur.doctorName,case when ur.operationTime is null then ur.enteringDate else ur.operationTime end useTime "
 				+" from MaterialErrorDamageDetail medd "
 				+" join MaterialDefinition md on md.id=medd.materialDefinitionId "
@@ -436,7 +436,7 @@
 				+" left join UseRecord ur on ur.id=ra.userecord_id "
 				+" where ri.amount = 1 "
 				+" union all "
-				+" select medd.damageRemark,medd.type,medd.operator,medd.materialName,medd.toussename,medd.operationTime,medd.depart,medd.amount,medd.materialCost, "
+				+" select medd.damageRemark,medd.type,medd.operator,medd.materialName,ri.toussename,medd.operationTime,medd.depart,medd.amount,medd.materialCost, "
 				+" null,null,null "
 				+" from MaterialErrorDamageDetail medd  "
 				+" join MaterialDefinition md on md.id=medd.materialDefinitionId "
@@ -485,6 +485,7 @@
 				}
 				
 				MaterialDamageItemBean itemBean = new MaterialDamageItemBean();
+				itemBean.setTousseName(item.getTousseName());
 				itemBean.setMaterialName(item.getMaterialName());
 				itemBean.setDamageAmount(item.getDamageAmount());
 				itemBean.setDamageReporter(item.getDamageReporter());
Index: ssts-web/src/main/webapp/jasperRtp/materialDamageItemView_subreport.jasper
===================================================================
diff -u -r27617 -r38988
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml
===================================================================
diff -u -r34012 -r38988
--- ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml	(.../materialDamageItemView.jrxml)	(revision 34012)
+++ ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml	(.../materialDamageItemView.jrxml)	(revision 38988)
@@ -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="materialDamageItemView" language="groovy" pageWidth="1103" pageHeight="815" columnWidth="1103" 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="1253" pageHeight="815" columnWidth="1253" 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.x" value="42"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -58,7 +58,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="1058aff5-20f1-45b4-9335-b49559949f8d" x="0" y="0" width="1103" height="30"/>
+				<reportElement uuid="1058aff5-20f1-45b4-9335-b49559949f8d" x="0" y="0" width="1253" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -90,68 +90,75 @@
 				<text><![CDATA[报损时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffda6fce-5225-4729-af3a-ffed93397e7a" style="table_TH" x="323" y="0" width="150" height="35"/>
+				<reportElement uuid="ffda6fce-5225-4729-af3a-ffed93397e7a" style="table_TH" x="473" 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="473" y="0" width="70" height="35"/>
+				<reportElement uuid="bd5e1793-a45b-4eca-8551-007a8f6b10f3" style="table_TH" x="623" 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="543" y="0" width="70" height="35"/>
+				<reportElement uuid="4e73322f-3e44-491a-9028-46d7cceba096" style="table_TH" x="693" 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="613" y="0" width="80" height="35"/>
+				<reportElement uuid="4e73322f-3e44-491a-9028-46d7cceba096" style="table_TH" x="763" 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="693" y="0" width="80" height="35"/>
+				<reportElement uuid="4e73322f-3e44-491a-9028-46d7cceba096" style="table_TH" x="843" 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="773" y="0" width="120" height="35"/>
+				<reportElement uuid="e893b019-fcc5-4f5a-88b7-efbbcd68b962" style="table_TH" x="923" 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="963" y="0" width="70" height="35"/>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="1113" 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="893" y="0" width="70" height="35"/>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="1043" 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="1033" y="0" width="70" height="35"/>
+				<reportElement uuid="22393741-226d-499b-b66c-67013f71f30b" style="table_TH" x="1183" y="0" width="70" 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="323" y="0" width="150" height="35"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[器械包名称]]></text>
+			</staticText>
 		</band>
 	</pageHeader>
 	<detail>
@@ -171,12 +178,12 @@
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
 			<subreport isUsingCache="false">
-				<reportElement uuid="43c8e776-4407-4359-a99b-1546c515bbdc" x="123" y="0" width="770" height="30"/>
+				<reportElement uuid="43c8e776-4407-4359-a99b-1546c515bbdc" x="123" y="0" width="920" 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="963" y="0" width="70" height="30"/>
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="1113" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -190,7 +197,7 @@
 				<textFieldExpression><![CDATA[$F{rate}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0" isBlankWhenNull="true">
-				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="893" y="0" width="70" height="30"/>
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="1043" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -204,7 +211,7 @@
 				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="1033" y="0" width="70" height="30"/>
+				<reportElement uuid="7c21263e-480c-47f5-97d7-31bb227cd7e7" stretchType="RelativeToBandHeight" x="1183" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -222,28 +229,28 @@
 	<summary>
 		<band height="31">
 			<staticText>
-				<reportElement uuid="2de98dcc-e086-470a-88c3-efa3af5874e3" style="table_CH" x="0" y="0" width="893" height="30"/>
+				<reportElement uuid="2de98dcc-e086-470a-88c3-efa3af5874e3" style="table_CH" x="0" y="0" width="1043" 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="893" y="0" width="70" height="30"/>
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="1043" 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="1033" y="0" width="70" height="30"/>
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="1183" 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="963" y="0" width="70" height="30"/>
+				<reportElement uuid="15423c19-55f6-47d8-b786-4e561eddd536" style="table_CH" x="1113" y="0" width="70" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/materialDamageItemView_subreport.jrxml
===================================================================
diff -u -r27617 -r38988
--- ssts-web/src/main/webapp/jasperRtp/materialDamageItemView_subreport.jrxml	(.../materialDamageItemView_subreport.jrxml)	(revision 27617)
+++ ssts-web/src/main/webapp/jasperRtp/materialDamageItemView_subreport.jrxml	(.../materialDamageItemView_subreport.jrxml)	(revision 38988)
@@ -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_subreport" language="groovy" pageWidth="770" pageHeight="30" columnWidth="770" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="6bd82db6-8be6-466d-8338-726e6c961e5a">
+<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_subreport" language="groovy" pageWidth="920" pageHeight="30" columnWidth="920" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="6bd82db6-8be6-466d-8338-726e6c961e5a">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -24,13 +24,16 @@
 	<field name="circuitNurse" class="java.lang.String"/>
 	<field name="doctorName" class="java.lang.String"/>
 	<field name="useTime" class="java.lang.String"/>
+	<field name="tousseName" class="java.lang.String">
+		<fieldDescription><![CDATA[tousseName]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<detail>
 		<band height="30" splitType="Stretch">
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" x="200" y="0" width="150" height="30"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="350" y="0" width="150" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -43,8 +46,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{materialName}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" x="350" y="0" width="70" height="30"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="500" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -57,8 +60,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{damageAmount}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" x="420" y="0" width="70" height="30"/>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="570" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -71,8 +74,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{materialCost} == null ? 0.00 : $F{materialCost}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" x="0" y="0" width="70" height="30"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="0" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -85,8 +88,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{damageReporter}]]></textFieldExpression>
 			</textField>
-			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" x="70" y="0" width="130" height="30"/>
+			<textField isStretchWithOverflow="true" pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="70" y="0" width="130" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -99,8 +102,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{damageTime}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" x="490" y="0" width="80" height="30"/>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="640" y="0" width="80" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -113,8 +116,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{circuitNurse} == null ? "" : $F{circuitNurse}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" x="570" y="0" width="80" height="30"/>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="720" y="0" width="80" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -127,8 +130,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{doctorName} == null ? "" : $F{doctorName}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" x="650" y="0" width="120" height="30"/>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="800" y="0" width="120" height="30"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -141,6 +144,20 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{useTime} == null ? "" : $F{useTime}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="3f38c25c-f5e3-404f-b3e2-21cc8eedcb1c" stretchType="RelativeToBandHeight" x="200" y="0" width="150" height="30"/>
+				<box>
+					<pen lineWidth="0.25"/>
+					<topPen lineWidth="0.25"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jasper
===================================================================
diff -u -r34012 -r38988
Binary files differ