Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
===================================================================
diff -u -r27617 -r29860
--- ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml	(.../DepartmentMonthDetail.jrxml)	(revision 27617)
+++ ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml	(.../DepartmentMonthDetail.jrxml)	(revision 29860)
@@ -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="1095" pageHeight="875" columnWidth="1095" 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="1195" pageHeight="875" columnWidth="1195" 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"/>
@@ -40,6 +40,9 @@
 	<field name="items" class="java.util.List">
 		<fieldDescription><![CDATA[items]]></fieldDescription>
 	</field>
+	<field name="applicationDepart" class="java.lang.String">
+		<fieldDescription><![CDATA[applicationDepart]]></fieldDescription>
+	</field>
 	<variable name="sum_amount" class="java.lang.Double" calculation="Sum">
 		<initialValueExpression><![CDATA[0]]></initialValueExpression>
 	</variable>
@@ -53,7 +56,7 @@
 	<title>
 		<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="0" y="0" width="1195" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -64,105 +67,119 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[科室]]></text>
+				<text><![CDATA[申请科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="260" y="35" width="200" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="360" 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="35" width="70" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="560" 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="35" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="710" 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="35" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="1015" 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="35" width="100" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="1095" 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="35" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="08e8c4f2-7992-4b1b-bc4b-c98923482960" style="table_TH" x="630" 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="35" width="145" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="790" 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="35" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="935" 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="35" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="200" 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="35" width="80" height="34" backcolor="#FFFFFF"/>
+				<reportElement uuid="6ed55d4f-d8a4-45f2-8a34-c0ae3e89f9aa" style="table_TH" x="280" 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="71b10d1c-6970-4e43-85ca-f94c3e1ce2a1" style="table_TH" x="100" y="35" width="100" height="34" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[结算科室]]></text>
+			</staticText>
 		</band>
 	</title>
 	<detail>
 		<band height="35" splitType="Stretch">
-			<textField>
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="fa08bf5e-8c0a-4b6c-9ff7-ece46b2b1b06" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{applicationDepart}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="995" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="1095" y="0" width="100" 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" stretchType="RelativeToBandHeight" mode="Transparent" x="100" y="0" width="895" height="35"/>
+				<reportElement uuid="17170695-399b-4463-ac82-477c70660490" stretchType="RelativeToBandHeight" mode="Transparent" x="200" y="0" width="895" height="35"/>
 				<subreportParameter name="depart">
 					<subreportParameterExpression><![CDATA[$F{depart}]]></subreportParameterExpression>
 				</subreportParameter>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{items})]]></dataSourceExpression>
 				<returnValue subreportVariable="totalAmount" toVariable="sum_amount" calculation="Sum"/>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "DepartmentMonthDetail_child.jasper"]]></subreportExpression>
 			</subreport>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="fa08bf5e-8c0a-4b6c-9ff7-ece46b2b1b06" style="table_TD" stretchType="RelativeToBandHeight" x="100" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<pageFooter>
@@ -178,22 +195,22 @@
 				<textFieldExpression><![CDATA["合计"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="530" y="0" width="465" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="630" y="0" width="465" height="35" backcolor="#FFFFFF"/>
 				<textElement/>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e8cfb76c-c9f4-482a-a857-b6544c593d77" style="table_TH" x="100" y="0" width="360" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="e8cfb76c-c9f4-482a-a857-b6544c593d77" style="table_TH" x="100" y="0" width="460" height="35" backcolor="#FFFFFF"/>
 				<textElement/>
 			</textField>
 			<textField pattern="###0">
-				<reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TH" x="460" y="0" width="70" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TH" x="560" y="0" width="70" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<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="995" y="0" width="100" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="1095" y="0" width="100" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>