Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
===================================================================
diff -u -r13086 -r13087
--- ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml	(.../DepartmentMonthDetail.jrxml)	(revision 13086)
+++ ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml	(.../DepartmentMonthDetail.jrxml)	(revision 13087)
@@ -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="DepartmentMonthDetail" language="groovy" pageWidth="1015" pageHeight="910" columnWidth="1015" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="701ff2f7-7ef5-4278-be9c-7a914bd1521b">
+<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="DepartmentMonthDetail" language="groovy" pageWidth="1045" pageHeight="910" columnWidth="1045" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="701ff2f7-7ef5-4278-be9c-7a914bd1521b">
 	<property name="ireport.zoom" value="0.75"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -53,7 +53,7 @@
 	<title>
 		<band height="35">
 			<textField>
-				<reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="0" width="1015" height="35"/>
+				<reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="0" width="1045" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -71,70 +71,70 @@
 				<text><![CDATA[科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="150" y="0" width="200" height="35"/>
+				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="180" y="0" width="200" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[物品名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="350" y="0" width="50" height="35"/>
+				<reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="380" y="0" width="50" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="480" y="0" width="80" height="35"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="510" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[单价（元）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="865" y="0" width="70" height="35"/>
+				<reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="895" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[总计（元）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="935" y="0" width="80" height="35"/>
+				<reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="965" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[总价（元）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="08e8c4f2-7992-4b1b-bc4b-c98923482960" style="table_TH" x="400" y="0" width="80" height="35"/>
+				<reportElement uuid="08e8c4f2-7992-4b1b-bc4b-c98923482960" style="table_TH" x="430" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[批次]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="560" y="0" width="145" height="35"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="590" y="0" width="145" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[生产厂家]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="785" y="0" width="80" height="35"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="815" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[失效期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="705" y="0" width="80" height="35"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="735" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[生产日期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="100" y="0" width="50" height="35"/>
+				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="100" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -152,14 +152,14 @@
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="935" y="0" width="80" height="35" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="965" y="0" width="80" height="35" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{totalPrice}]]></textFieldExpression>
 			</textField>
 			<subreport runToBottom="false">
-				<reportElement uuid="17170695-399b-4463-ac82-477c70660490" style="table_TD" stretchType="RelativeToBandHeight" x="100" y="0" width="835" height="35" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="17170695-399b-4463-ac82-477c70660490" style="table_TD" stretchType="RelativeToBandHeight" x="100" y="0" width="865" height="35" isPrintWhenDetailOverflows="true"/>
 				<subreportParameter name="depart">
 					<subreportParameterExpression><![CDATA[$F{depart}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -170,23 +170,23 @@
 		</band>
 	</detail>
 	<pageFooter>
-		<band height="70" splitType="Stretch">
+		<band height="71" splitType="Stretch">
 			<textField>
-				<reportElement uuid="6fbd774a-d10e-4db8-99f8-c7fdd600c61f" x="0" y="0" width="865" height="70"/>
+				<reportElement uuid="6fbd774a-d10e-4db8-99f8-c7fdd600c61f" x="0" y="0" width="895" height="70"/>
 				<textElement verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="001cdc62-ce22-4f2a-a982-6afb6668c845" x="865" y="0" width="70" height="70"/>
+				<reportElement uuid="001cdc62-ce22-4f2a-a982-6afb6668c845" x="895" y="0" width="70" height="70"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["第 "+$V{PAGE_NUMBER}+" 页"]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement uuid="e737b9b8-dca2-4238-8eb1-380f35945aea" x="935" y="0" width="80" height="70"/>
+				<reportElement uuid="e737b9b8-dca2-4238-8eb1-380f35945aea" x="965" y="0" width="80" height="70"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -204,27 +204,27 @@
 				<textFieldExpression><![CDATA["合计"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="400" y="0" width="535" height="35"/>
+				<reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="430" y="0" width="535" height="35"/>
 				<textElement/>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="935" y="0" width="80" height="35"/>
+				<reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="965" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sum_totalPrice}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="e8cfb76c-c9f4-482a-a857-b6544c593d77" style="table_TH" x="100" y="0" width="280" height="35"/>
+				<textElement/>
+			</textField>
 			<textField pattern="###0">
-				<reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TH" x="350" y="0" width="50" height="35"/>
+				<reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TH" x="380" y="1" width="50" height="34"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sum_amount}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="e8cfb76c-c9f4-482a-a857-b6544c593d77" style="table_TH" x="100" y="0" width="250" height="35"/>
-				<textElement/>
-			</textField>
 		</band>
 	</summary>
 </jasperReport>