Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
===================================================================
diff -u -r15296 -r15338
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
===================================================================
diff -u -r15296 -r15338
--- ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml	(.../DepartmentMonthDetail.jrxml)	(revision 15296)
+++ ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml	(.../DepartmentMonthDetail.jrxml)	(revision 15338)
@@ -51,97 +51,93 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="35">
+		<band height="69">
 			<textField>
-				<reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="0" width="1095" height="35"/>
+				<reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="1" y="0" width="1095" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
-		</band>
-	</title>
-	<columnHeader>
-		<band height="34" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="71b10d1c-6970-4e43-85ca-f94c3e1ce2a1" style="table_TH" x="0" y="0" width="100" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="71b10d1c-6970-4e43-85ca-f94c3e1ce2a1" style="table_TH" x="0" y="35" width="100" height="34" backcolor="#FFFFFF"/>
 				<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="260" y="0" width="200" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="260" y="35" width="200" height="34" backcolor="#FFFFFF"/>
 				<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="460" y="0" width="70" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="460" y="35" width="70" height="34" backcolor="#FFFFFF"/>
 				<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="610" y="0" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="610" y="35" width="80" height="34" backcolor="#FFFFFF"/>
 				<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="915" y="0" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="915" y="35" width="80" height="34" backcolor="#FFFFFF"/>
 				<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="995" y="0" width="100" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="995" y="35" width="100" height="34" backcolor="#FFFFFF"/>
 				<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="530" y="0" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="08e8c4f2-7992-4b1b-bc4b-c98923482960" style="table_TH" x="530" y="35" width="80" height="34" backcolor="#FFFFFF"/>
 				<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="690" y="0" width="145" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="690" y="35" width="145" height="34" backcolor="#FFFFFF"/>
 				<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="835" y="0" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="835" y="35" width="80" height="34" backcolor="#FFFFFF"/>
 				<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="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="100" y="35" width="80" height="34" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[类型]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="6ed55d4f-d8a4-45f2-8a34-c0ae3e89f9aa" style="table_TH" x="180" y="0" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="6ed55d4f-d8a4-45f2-8a34-c0ae3e89f9aa" style="table_TH" x="180" y="35" width="80" height="34" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[外部编码]]></text>
 			</staticText>
 		</band>
-	</columnHeader>
+	</title>
 	<detail>
 		<band height="35" splitType="Stretch">
 			<textField>
@@ -159,7 +155,7 @@
 				<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="895" height="35"/>
+				<reportElement uuid="17170695-399b-4463-ac82-477c70660490" stretchType="RelativeToBandHeight" mode="Transparent" x="100" y="0" width="895" height="35"/>
 				<subreportParameter name="depart">
 					<subreportParameterExpression><![CDATA[$F{depart}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -170,29 +166,7 @@
 		</band>
 	</detail>
 	<pageFooter>
-		<band height="71" splitType="Stretch">
-			<textField>
-				<reportElement uuid="6fbd774a-d10e-4db8-99f8-c7fdd600c61f" x="0" y="0" width="915" 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="915" y="0" width="80" 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="995" y="0" width="100" height="70"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA["共 "+$V{PAGE_NUMBER}+" 页"]]></textFieldExpression>
-			</textField>
-		</band>
+		<band splitType="Stretch"/>
 	</pageFooter>
 	<summary>
 		<band height="35" splitType="Stretch">
@@ -204,7 +178,7 @@
 				<textFieldExpression><![CDATA["合计"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="530" y="0" width="545" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="530" y="0" width="465" height="35" backcolor="#FFFFFF"/>
 				<textElement/>
 			</textField>
 			<textField isBlankWhenNull="true">
@@ -219,7 +193,7 @@
 				<textFieldExpression><![CDATA[$V{sum_amount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000;-###0.0000" isBlankWhenNull="true">
-				<reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="994" y="0" width="101" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="995" y="0" width="100" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>