Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r35556 -r35558
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 35556)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 35558)
@@ -398,41 +398,6 @@
 					break;
 				}
 			}
-			if("supplyRoomQualityQuota".equals(reportName) || "statisticalWorkload".equals(reportName) || "monthReport".equals(reportName)){//对于这些报表 数字单元格内容设置右边距
-				for (int i = 0; i < size; i++) {
-					JRPrintElement jr = jRPrintElements.get(i);
-					if(!(jr instanceof JRTemplatePrintFrame)){
-						continue;
-					}
-					List<JRPrintElement> elements = ((JRTemplatePrintFrame) jr).getElements();
-					if(CollectionUtils.isEmpty(elements)){
-						continue;
-					}
-					for (int j = 0; j < elements.size(); j++) {
-						JRPrintElement jItem = elements.get(j);
-						if(!(jItem instanceof JRTemplatePrintFrame)){
-							continue;
-						}
-						JRTemplatePrintFrame jpf = (JRTemplatePrintFrame)jItem;
-						if(CollectionUtils.isEmpty(jpf.getElements())){
-							continue;
-						}
-						for (int k = 0; k < jpf.getElements().size(); k++) {
-							JRPrintElement kItem = jpf.getElements().get(k);
-							if(!(kItem instanceof JRTemplatePrintText)){
-								continue;
-							}
-							JRTemplatePrintText kItemText = (JRTemplatePrintText)kItem;
-							if(StringUtils.isNotBlank(kItemText.getFullText()) && StringTools.isNumber(kItemText.getFullText())){
-								if("supplyRoomQualityQuota".equals(reportName) && kItemText.getHeight() == 30){
-									continue;//供应室护理质量指标表 按天查询的列名不偏移
-								}
-								kItemText.getLineBox().setRightPadding(8);
-							}
-						}
-					}
-				}
-			}		
 			for (int i = 0; i < jRPrintElements.size(); i++) {
 				JRPrintElement jr = jRPrintElements.get(i);
 				if(jr instanceof JRTemplatePrintText){
Index: ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jasper
===================================================================
diff -u -r29441 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jasper
===================================================================
diff -u -r34644 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml
===================================================================
diff -u -r33175 -r35558
--- ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml	(.../statisticalWorkload.jrxml)	(revision 33175)
+++ ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml	(.../statisticalWorkload.jrxml)	(revision 35558)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="statisticalWorkload" language="groovy" pageWidth="220" pageHeight="1200" columnWidth="220" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cbf22cc0-e3ae-4485-a118-b438d682d7e3">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
 	<parameter name="title" class="java.lang.String">
 		<defaultValueExpression><![CDATA[title]]></defaultValueExpression>
 	</parameter>
@@ -29,7 +30,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="8a494fab-981d-4237-9e12-32835b7fa569" x="0" y="0" width="1846" height="30"/>
+				<reportElement x="0" y="0" width="1846" height="30" uuid="8a494fab-981d-4237-9e12-32835b7fa569"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -40,11 +41,14 @@
 	<summary>
 		<band height="30" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="bbefa993-f197-47ce-bf52-186e824d3ebc" stretchType="RelativeToTallestObject" x="0" y="0" width="3000" height="30"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="3000" height="30" uuid="bbefa993-f197-47ce-bf52-186e824d3ebc"/>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="9aa33780-d8b1-4388-aa2d-ca55c29979f1" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="70" height="55" forecolor="#000000" backcolor="#FFFFFF"/>
+							<reportElement style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="70" height="55" forecolor="#000000" backcolor="#FFFFFF" uuid="9aa33780-d8b1-4388-aa2d-ca55c29979f1"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -67,7 +71,7 @@
 					<crosstabRowHeader>
 						<cellContents backcolor="#FFFFFF" mode="Opaque">
 							<textField pattern="" isBlankWhenNull="false">
-								<reportElement uuid="18aa4f8a-a19b-4555-8dfe-88e045561c72" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="70" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+								<reportElement style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="70" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="18aa4f8a-a19b-4555-8dfe-88e045561c72"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -86,7 +90,7 @@
 					<crosstabTotalRowHeader>
 						<cellContents backcolor="#FFFFFF" mode="Opaque">
 							<staticText>
-								<reportElement uuid="c3247cff-8f4a-40e4-bbd2-01972f0018bd" x="0" y="0" width="70" height="30"/>
+								<reportElement x="0" y="0" width="70" height="30" uuid="c3247cff-8f4a-40e4-bbd2-01972f0018bd"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -120,7 +124,7 @@
 					<crosstabColumnHeader>
 						<cellContents backcolor="#FFFFFF" mode="Opaque">
 							<textField pattern="" isBlankWhenNull="false">
-								<reportElement uuid="d01d2df8-4930-4455-b890-b9960056d2a5" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="150" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+								<reportElement style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="150" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="d01d2df8-4930-4455-b890-b9960056d2a5"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -135,7 +139,7 @@
 								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
 							</textField>
 							<staticText>
-								<reportElement uuid="953e5c2e-da0c-4657-9059-0673ebe92e42" style="Crosstab Data Text" x="0" y="30" width="75" height="25"/>
+								<reportElement style="Crosstab Data Text" x="0" y="30" width="75" height="25" uuid="953e5c2e-da0c-4657-9059-0673ebe92e42"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -149,7 +153,7 @@
 								<text><![CDATA[包数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="8c0a00c9-b16f-41d1-bf23-255c4d4028f5" style="Crosstab Data Text" mode="Opaque" x="75" y="30" width="75" height="25" backcolor="#CCFFCC"/>
+								<reportElement style="Crosstab Data Text" mode="Opaque" x="75" y="30" width="75" height="25" backcolor="#CCFFCC" uuid="8c0a00c9-b16f-41d1-bf23-255c4d4028f5"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -177,7 +181,9 @@
 				<crosstabCell width="150" height="30">
 					<cellContents>
 						<textField>
-							<reportElement uuid="04ec2f5b-0dfc-4109-8616-6c09675dfa8c" style="Crosstab Data Text" x="0" y="0" width="75" height="30"/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="75" height="30" uuid="04ec2f5b-0dfc-4109-8616-6c09675dfa8c">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -187,11 +193,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="08f99324-322c-4918-a578-b6dcc1a91123" style="Crosstab Data Text" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC" uuid="08f99324-322c-4918-a578-b6dcc1a91123">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -201,6 +210,7 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
@@ -209,7 +219,9 @@
 				<crosstabCell width="150" height="31" rowTotalGroup="operator">
 					<cellContents backcolor="#FFFFFF" mode="Opaque">
 						<textField>
-							<reportElement uuid="2721048b-46bc-4214-929a-12b1bfc4255d" style="Crosstab Data Text" x="0" y="0" width="75" height="30"/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="75" height="30" uuid="2721048b-46bc-4214-929a-12b1bfc4255d">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -219,11 +231,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="08f99324-322c-4918-a578-b6dcc1a91123" style="Crosstab Data Text" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC" uuid="08f99324-322c-4918-a578-b6dcc1a91123">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -233,6 +248,7 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
@@ -241,35 +257,31 @@
 				<crosstabCell width="50" columnTotalGroup="sequence">
 					<cellContents backcolor="#005FB3" mode="Opaque">
 						<textField>
-							<reportElement uuid="b1fe81ff-ce6e-40c9-a39e-50465ad08fbd" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF" uuid="b1fe81ff-ce6e-40c9-a39e-50465ad08fbd"/>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
 				<crosstabCell rowTotalGroup="operator" columnTotalGroup="sequence">
 					<cellContents backcolor="#005FB3" mode="Opaque">
 						<textField>
-							<reportElement uuid="7dda8e68-a3e7-41d7-b367-ae8fc9e80b7f" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF" uuid="7dda8e68-a3e7-41d7-b367-ae8fc9e80b7f"/>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
 				<crosstabCell width="50" columnTotalGroup="columnName">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<textField>
-							<reportElement uuid="0454d3f6-00e9-4788-ae4a-09c4ac05e96a" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" uuid="0454d3f6-00e9-4788-ae4a-09c4ac05e96a"/>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
 				<crosstabCell rowTotalGroup="operator" columnTotalGroup="columnName">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<textField>
-							<reportElement uuid="62e397c1-5e67-4374-9d76-da3db87b2ceb" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" uuid="62e397c1-5e67-4374-9d76-da3db87b2ceb"/>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml
===================================================================
diff -u -r30980 -r35558
--- ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml	(.../monthReportGroupBySterilizationMode.jrxml)	(revision 30980)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml	(.../monthReportGroupBySterilizationMode.jrxml)	(revision 35558)
@@ -1,337 +1,347 @@
-<?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="monthReport" language="groovy" pageWidth="800" pageHeight="824" columnWidth="800" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
-	<style name="table">
-		<box>
-			<pen lineWidth="1.0" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
-	<parameter name="title" class="java.lang.String">
-		<parameterDescription><![CDATA[""]]></parameterDescription>
-	</parameter>
-	<parameter name="amountFormat" class="java.lang.String">
-		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="rowNum" class="java.lang.String">
-		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
-	</field>
-	<field name="columnNum" class="java.lang.String">
-		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
-	</field>
-	<field name="columnName" class="java.lang.String">
-		<fieldDescription><![CDATA[columnName]]></fieldDescription>
-	</field>
-	<field name="department" class="java.lang.String">
-		<fieldDescription><![CDATA[department]]></fieldDescription>
-	</field>
-	<field name="amount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[amount]]></fieldDescription>
-	</field>
-	<field name="money" class="java.lang.Double">
-		<fieldDescription><![CDATA[money]]></fieldDescription>
-	</field>
-	<field name="columnTitle" class="java.lang.String">
-		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
-	</field>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
-	</field>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="34" splitType="Stretch">
-			<textField>
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="800" height="34"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<summary>
-		<band height="127" splitType="Stretch">
-			<crosstab>
-				<reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="800" height="103"/>
-				<crosstabParameter name="amountFormatParam">
-					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabHeaderCell>
-					<cellContents>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="0" width="290" height="80" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<text><![CDATA[部门]]></text>
-						</staticText>
-					</cellContents>
-				</crosstabHeaderCell>
-				<rowGroup name="rowNum" width="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}==null?9999:$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="290" height="25" forecolor="#000000"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<rowGroup name="department" width="290" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}==null?9999:$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="290" height="25"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{department}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<columnGroup name="columnNum" height="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField>
-								<reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="38"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d" x="0" y="0" width="81" height="80"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计1]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnName" height="42" headerPosition="Center">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents>
-							<textField>
-								<reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="42" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnName}.substring(1)]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents/>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{money}]]></measureExpression>
-				</measure>
-				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
-					<measureExpression><![CDATA[$F{sequence}]]></measureExpression>
-				</measure>
-				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
-					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
-				</measure>
-				<crosstabCell width="79" height="25">
-					<cellContents>
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField pattern="">
-							<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25"/>
-							<textElement verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="25" rowTotalGroup="rowNum">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField pattern="">
-							<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000"/>
-							<textElement verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="25" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField pattern="" isBlankWhenNull="true">
-							<reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25"/>
-							<textElement verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField pattern="" isBlankWhenNull="true">
-							<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000"/>
-							<textElement verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="0" rowTotalGroup="department">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="rowNum" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-			</crosstab>
-		</band>
-	</summary>
-</jasperReport>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<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="monthReport" language="groovy" pageWidth="800" pageHeight="824" columnWidth="800" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
+	<parameter name="title" class="java.lang.String">
+		<parameterDescription><![CDATA[""]]></parameterDescription>
+	</parameter>
+	<parameter name="amountFormat" class="java.lang.String">
+		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="rowNum" class="java.lang.String">
+		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
+	</field>
+	<field name="columnNum" class="java.lang.String">
+		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
+	</field>
+	<field name="columnName" class="java.lang.String">
+		<fieldDescription><![CDATA[columnName]]></fieldDescription>
+	</field>
+	<field name="department" class="java.lang.String">
+		<fieldDescription><![CDATA[department]]></fieldDescription>
+	</field>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
+	</field>
+	<field name="money" class="java.lang.Double">
+		<fieldDescription><![CDATA[money]]></fieldDescription>
+	</field>
+	<field name="columnTitle" class="java.lang.String">
+		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
+	</field>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="34" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="800" height="34" uuid="14137749-263e-4143-a8dd-482900def002"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<summary>
+		<band height="127" splitType="Stretch">
+			<crosstab>
+				<reportElement x="0" y="0" width="800" height="103" uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c"/>
+				<crosstabParameter name="amountFormatParam">
+					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
+				<crosstabHeaderCell>
+					<cellContents>
+						<staticText>
+							<reportElement style="table_TH" x="0" y="0" width="290" height="80" backcolor="#FFFFFF" uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<text><![CDATA[部门]]></text>
+						</staticText>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="rowNum" width="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}==null?9999:$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement x="0" y="0" width="290" height="25" forecolor="#000000" uuid="1311756a-eafc-440e-926f-b78c03af13a7"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<rowGroup name="department" width="290" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}==null?9999:$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="290" height="25" uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0"/>
+								<textElement verticalAlignment="Middle">
+									<font size="12"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{department}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="columnNum" height="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="79" height="38" uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d"/>
+								<textElement verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement x="0" y="0" width="81" height="80" uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计1]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnName" height="42" headerPosition="Center">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents>
+							<textField>
+								<reportElement style="table_TH" x="0" y="0" width="79" height="42" backcolor="#FFFFFF" uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnName}.substring(1)]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
+					<measureExpression><![CDATA[$F{money}]]></measureExpression>
+				</measure>
+				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
+					<measureExpression><![CDATA[$F{sequence}]]></measureExpression>
+				</measure>
+				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
+				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
+					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
+				</measure>
+				<crosstabCell width="79" height="25">
+					<cellContents>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField pattern="">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25" uuid="d304edd7-5900-4bdf-916c-1a90972f5d38"/>
+							<textElement verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="79" height="25" rowTotalGroup="rowNum">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField pattern="">
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000" uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph rightIndent="0"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="25" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField pattern="" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25" uuid="8d59cefd-47be-4107-a902-d5fc6d238879"/>
+							<textElement verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField pattern="" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000" uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph rightIndent="0"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="79" height="0" rowTotalGroup="department">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="rowNum" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jasper
===================================================================
diff -u -r33175 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jasper
===================================================================
diff -u -r30980 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper
===================================================================
diff -u -r30980 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jasper
===================================================================
diff -u -r30980 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml
===================================================================
diff -u -r30980 -r35558
--- ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml	(.../monthReportHideApplicationDepart.jrxml)	(revision 30980)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml	(.../monthReportHideApplicationDepart.jrxml)	(revision 35558)
@@ -1,381 +1,394 @@
-<?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="monthReport" language="groovy" pageWidth="352" pageHeight="824" columnWidth="352" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
-	<style name="table">
-		<box>
-			<pen lineWidth="1.0" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
-	<parameter name="title" class="java.lang.String">
-		<parameterDescription><![CDATA[""]]></parameterDescription>
-	</parameter>
-	<parameter name="amountFormat" class="java.lang.String">
-		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
-	</parameter>
-	<parameter name="applicationDepartShowName" class="java.lang.String">
-		<defaultValueExpression><![CDATA[applicationDepartShowName]]></defaultValueExpression>
-	</parameter>
-	<parameter name="settleAccountsDepartShowName" class="java.lang.String">
-		<defaultValueExpression><![CDATA[settleAccountsDepartShowName]]></defaultValueExpression>
-	</parameter>
-	<parameter name="sumPriceShowName" class="java.lang.String">
-		<defaultValueExpression><![CDATA[sumPriceShowName]]></defaultValueExpression>
-	</parameter>
-	<parameter name="sumAmountShowName" class="java.lang.String">
-		<defaultValueExpression><![CDATA[sumAmountShowName]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="rowNum" class="java.lang.String">
-		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
-	</field>
-	<field name="columnNum" class="java.lang.String">
-		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
-	</field>
-	<field name="columnName" class="java.lang.String">
-		<fieldDescription><![CDATA[columnName]]></fieldDescription>
-	</field>
-	<field name="department" class="java.lang.String">
-		<fieldDescription><![CDATA[department]]></fieldDescription>
-	</field>
-	<field name="amount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[amount]]></fieldDescription>
-	</field>
-	<field name="money" class="java.lang.Double">
-		<fieldDescription><![CDATA[money]]></fieldDescription>
-	</field>
-	<field name="columnTitle" class="java.lang.String">
-		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
-	</field>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
-	</field>
-	<field name="applicationDepart" class="java.lang.String">
-		<fieldDescription><![CDATA[applicationDepart]]></fieldDescription>
-	</field>
-	<variable name="maxAmount" class="java.lang.Integer" calculation="Highest">
-		<variableExpression><![CDATA[$F{amount}]]></variableExpression>
-	</variable>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="34" splitType="Stretch">
-			<textField>
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="352" height="34"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<summary>
-		<band height="127" splitType="Stretch">
-			<crosstab>
-				<reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="352" height="103"/>
-				<crosstabParameter name="amountFormatParam">
-					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="appDepartShowNameParam">
-					<parameterValueExpression><![CDATA[$P{applicationDepartShowName}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="setDepartShowNameParam">
-					<parameterValueExpression><![CDATA[$P{settleAccountsDepartShowName}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="sumPriceShowNameParam">
-					<parameterValueExpression><![CDATA[$P{sumPriceShowName}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="sumAmountShowNameParam">
-					<parameterValueExpression><![CDATA[$P{sumAmountShowName}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabHeaderCell>
-					<cellContents>
-						<textField isBlankWhenNull="true">
-							<reportElement uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="95" backcolor="#FFFFFF"/>
-							<box>
-								<pen lineWidth="0.5"/>
-								<topPen lineWidth="0.5"/>
-								<leftPen lineWidth="0.5"/>
-								<bottomPen lineWidth="0.5"/>
-								<rightPen lineWidth="0.5"/>
-							</box>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true" isItalic="false"/>
-							</textElement>
-							<textFieldExpression><![CDATA[$P{setDepartShowNameParam}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabHeaderCell>
-				<rowGroup name="rowNum" width="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25" forecolor="#000000"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<rowGroup name="department" width="153" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25"/>
-								<box>
-									<pen lineWidth="1.0"/>
-									<topPen lineWidth="1.0"/>
-									<leftPen lineWidth="1.0"/>
-									<bottomPen lineWidth="1.0"/>
-									<rightPen lineWidth="1.0"/>
-								</box>
-								<textElement textAlignment="Left" verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{department}==null?"":"  "+$V{department}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<columnGroup name="columnNum" height="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnTitle" height="0" totalPosition="End" headerPosition="Stretch">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField>
-								<reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="0"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{maxAmount}>0||$V{amountMeasure}!=0?$P{sumAmountShowNameParam}:$P{sumPriceShowNameParam}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnName" height="95" headerPosition="Center">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents>
-							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-								<reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents/>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{money}]]></measureExpression>
-				</measure>
-				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
-					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
-				</measure>
-				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="maxAmount" class="java.lang.Integer" calculation="Highest">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
-					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
-				</measure>
-				<crosstabCell width="100" height="25">
-					<cellContents>
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="###0.0000">
-							<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="25" rowTotalGroup="rowNum">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-							<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="25" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-							<reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-							<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="0" rowTotalGroup="department">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-			</crosstab>
-		</band>
-	</summary>
-</jasperReport>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<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="monthReport" language="groovy" pageWidth="352" pageHeight="824" columnWidth="352" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
+	<parameter name="title" class="java.lang.String">
+		<parameterDescription><![CDATA[""]]></parameterDescription>
+	</parameter>
+	<parameter name="amountFormat" class="java.lang.String">
+		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
+	</parameter>
+	<parameter name="applicationDepartShowName" class="java.lang.String">
+		<defaultValueExpression><![CDATA[applicationDepartShowName]]></defaultValueExpression>
+	</parameter>
+	<parameter name="settleAccountsDepartShowName" class="java.lang.String">
+		<defaultValueExpression><![CDATA[settleAccountsDepartShowName]]></defaultValueExpression>
+	</parameter>
+	<parameter name="sumPriceShowName" class="java.lang.String">
+		<defaultValueExpression><![CDATA[sumPriceShowName]]></defaultValueExpression>
+	</parameter>
+	<parameter name="sumAmountShowName" class="java.lang.String">
+		<defaultValueExpression><![CDATA[sumAmountShowName]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="rowNum" class="java.lang.String">
+		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
+	</field>
+	<field name="columnNum" class="java.lang.String">
+		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
+	</field>
+	<field name="columnName" class="java.lang.String">
+		<fieldDescription><![CDATA[columnName]]></fieldDescription>
+	</field>
+	<field name="department" class="java.lang.String">
+		<fieldDescription><![CDATA[department]]></fieldDescription>
+	</field>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
+	</field>
+	<field name="money" class="java.lang.Double">
+		<fieldDescription><![CDATA[money]]></fieldDescription>
+	</field>
+	<field name="columnTitle" class="java.lang.String">
+		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
+	</field>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	</field>
+	<field name="applicationDepart" class="java.lang.String">
+		<fieldDescription><![CDATA[applicationDepart]]></fieldDescription>
+	</field>
+	<variable name="maxAmount" class="java.lang.Integer" calculation="Highest">
+		<variableExpression><![CDATA[$F{amount}]]></variableExpression>
+	</variable>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="34" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="352" height="34" uuid="14137749-263e-4143-a8dd-482900def002"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<summary>
+		<band height="127" splitType="Stretch">
+			<crosstab>
+				<reportElement x="0" y="0" width="352" height="103" uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c"/>
+				<crosstabParameter name="amountFormatParam">
+					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="appDepartShowNameParam">
+					<parameterValueExpression><![CDATA[$P{applicationDepartShowName}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="setDepartShowNameParam">
+					<parameterValueExpression><![CDATA[$P{settleAccountsDepartShowName}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="sumPriceShowNameParam">
+					<parameterValueExpression><![CDATA[$P{sumPriceShowName}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="sumAmountShowNameParam">
+					<parameterValueExpression><![CDATA[$P{sumAmountShowName}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
+				<crosstabHeaderCell>
+					<cellContents>
+						<textField isBlankWhenNull="true">
+							<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="95" backcolor="#FFFFFF" uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a"/>
+							<box>
+								<pen lineWidth="0.5"/>
+								<topPen lineWidth="0.5"/>
+								<leftPen lineWidth="0.5"/>
+								<bottomPen lineWidth="0.5"/>
+								<rightPen lineWidth="0.5"/>
+							</box>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true" isItalic="false"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$P{setDepartShowNameParam}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="rowNum" width="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25" forecolor="#000000" uuid="1311756a-eafc-440e-926f-b78c03af13a7"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<rowGroup name="department" width="153" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25" uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement textAlignment="Left" verticalAlignment="Middle">
+									<font size="12"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{department}==null?"":"  "+$V{department}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="columnNum" height="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnTitle" height="0" totalPosition="End" headerPosition="Stretch">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="79" height="0" uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d"/>
+								<textElement verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight">
+								<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF" uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{maxAmount}>0||$V{amountMeasure}!=0?$P{sumAmountShowNameParam}:$P{sumPriceShowNameParam}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnName" height="95" headerPosition="Center">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF" uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
+					<measureExpression><![CDATA[$F{money}]]></measureExpression>
+				</measure>
+				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
+					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
+				</measure>
+				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
+				<measure name="maxAmount" class="java.lang.Integer" calculation="Highest">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
+				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
+					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
+				</measure>
+				<crosstabCell width="100" height="25">
+					<cellContents>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="###0.0000">
+							<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" uuid="d304edd7-5900-4bdf-916c-1a90972f5d38"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="25" rowTotalGroup="rowNum">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="" isBlankWhenNull="true">
+							<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000" uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35"/>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="25" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="" isBlankWhenNull="true">
+							<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" uuid="8d59cefd-47be-4107-a902-d5fc6d238879">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="" isBlankWhenNull="true">
+							<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000" uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="0" rowTotalGroup="department">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell height="20" rowTotalGroup="rowNum" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jasper
===================================================================
diff -u -r30980 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml
===================================================================
diff -u -r33775 -r35558
--- ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml	(.../supplyRoomQualityQuota.jrxml)	(revision 33775)
+++ ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml	(.../supplyRoomQualityQuota.jrxml)	(revision 35558)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="supplyRoomQualityQuota" language="groovy" pageWidth="1000" pageHeight="842" columnWidth="1000" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="2988db68-ce04-4e05-a625-a4cee77166ab">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
 	<parameter name="title" class="java.lang.String"/>
 	<field name="columnName" class="java.lang.String">
 		<fieldDescription><![CDATA[columnName]]></fieldDescription>
@@ -26,7 +27,7 @@
 	<title>
 		<band height="38" splitType="Stretch">
 			<textField>
-				<reportElement uuid="9970edd2-d300-4de0-8b56-068541d3c1e1" x="0" y="0" width="1000" height="38"/>
+				<reportElement x="0" y="0" width="1000" height="38" uuid="9970edd2-d300-4de0-8b56-068541d3c1e1"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -37,11 +38,14 @@
 	<summary>
 		<band height="42" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="b9aef19d-d001-47f9-a0ca-f3d38f68124e" x="0" y="0" width="2000" height="42"/>
+				<reportElement x="0" y="0" width="2000" height="42" uuid="b9aef19d-d001-47f9-a0ca-f3d38f68124e"/>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="efbde1c9-384b-48ad-a2cc-879adb594797" style="Crosstab Data Text" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="80" height="30" forecolor="#000000" backcolor="#F0F8FF"/>
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="80" height="30" forecolor="#000000" backcolor="#F0F8FF" uuid="efbde1c9-384b-48ad-a2cc-879adb594797"/>
 							<box>
 								<pen lineWidth="0.5"/>
 								<topPen lineWidth="0.5"/>
@@ -81,8 +85,8 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="8d82180a-7b3c-45de-a0e6-10cf18b0c312" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="80" height="25"/>
+							<textField textAdjust="StretchHeight">
+								<reportElement style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="80" height="25" uuid="8d82180a-7b3c-45de-a0e6-10cf18b0c312"/>
 								<textElement verticalAlignment="Middle">
 									<font size="12" isBold="false"/>
 								</textElement>
@@ -118,8 +122,8 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="5e9a6665-127a-4211-92e8-d8768566770a" style="Crosstab Data Text" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="30"/>
+							<textField textAdjust="StretchHeight">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="30" uuid="5e9a6665-127a-4211-92e8-d8768566770a"/>
 								<box>
 									<pen lineWidth="0.5"/>
 									<topPen lineWidth="0.5"/>
@@ -147,9 +151,12 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="5378e2d5-2d92-49a1-a140-c360c59fad0f" style="Crosstab Data Text" x="0" y="0" width="90" height="25"/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="90" height="25" uuid="5378e2d5-2d92-49a1-a140-c360c59fad0f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
@@ -161,8 +168,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="385f64ef-a968-4d02-8eba-3eb536ce222b" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF" uuid="385f64ef-a968-4d02-8eba-3eb536ce222b"/>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -173,8 +179,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="0c6e9149-c997-4b11-b0e8-240d41be6b23" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF" uuid="0c6e9149-c997-4b11-b0e8-240d41be6b23"/>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -185,8 +190,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="8d23547e-7d9a-4191-ad00-37a7b2bf4672" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF" uuid="8d23547e-7d9a-4191-ad00-37a7b2bf4672"/>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -197,8 +201,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="6706b447-7556-4937-a225-d28e58abe4e2" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" uuid="6706b447-7556-4937-a225-d28e58abe4e2"/>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -209,8 +212,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="b4b6720a-e20b-456e-9eec-f077f450af80" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF" uuid="b4b6720a-e20b-456e-9eec-f077f450af80"/>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -221,8 +223,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="b24bdb88-b1e3-4934-aac3-12150295bb80" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" uuid="b24bdb88-b1e3-4934-aac3-12150295bb80"/>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -233,8 +234,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="957df49f-dfd6-40d6-adb1-cba4e90962a0" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF" uuid="957df49f-dfd6-40d6-adb1-cba4e90962a0"/>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -245,8 +245,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="882808be-7752-49d5-b8b5-8206f051e7c6" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" uuid="882808be-7752-49d5-b8b5-8206f051e7c6"/>
 							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jrxml
===================================================================
diff -u -r34644 -r35558
--- ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jrxml	(.../monthReportShowBrevityCode.jrxml)	(revision 34644)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jrxml	(.../monthReportShowBrevityCode.jrxml)	(revision 35558)
@@ -1,389 +1,413 @@
-<?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="monthReport" language="groovy" pageWidth="450" pageHeight="824" columnWidth="450" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
-	<style name="table">
-		<box>
-			<pen lineWidth="1.0" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
-	<parameter name="title" class="java.lang.String">
-		<parameterDescription><![CDATA[""]]></parameterDescription>
-	</parameter>
-	<parameter name="amountFormat" class="java.lang.String">
-		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
-	</parameter>
-	<parameter name="footerInfo" class="java.lang.String"/>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="rowNum" class="java.lang.String">
-		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
-	</field>
-	<field name="columnNum" class="java.lang.String">
-		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
-	</field>
-	<field name="columnName" class="java.lang.String">
-		<fieldDescription><![CDATA[columnName]]></fieldDescription>
-	</field>
-	<field name="department" class="java.lang.String">
-		<fieldDescription><![CDATA[department]]></fieldDescription>
-	</field>
-	<field name="amount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[amount]]></fieldDescription>
-	</field>
-	<field name="money" class="java.lang.Double">
-		<fieldDescription><![CDATA[money]]></fieldDescription>
-	</field>
-	<field name="columnTitle" class="java.lang.String">
-		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
-	</field>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
-	</field>
-	<field name="applicationDepart" class="java.lang.String">
-		<fieldDescription><![CDATA[applicationDepart]]></fieldDescription>
-	</field>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="34" splitType="Stretch">
-			<textField>
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="450" height="34"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<pageFooter>
-		<band height="21">
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="b067ffd6-7c60-4499-842e-fbd4965c5fbc" x="0" y="0" width="450" height="20"/>
-				<textElement textAlignment="Center"/>
-				<textFieldExpression><![CDATA[$P{footerInfo}]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageFooter>
-	<summary>
-		<band height="127" splitType="Stretch">
-			<crosstab>
-				<reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="450" height="103"/>
-				<crosstabParameter name="amountFormatParam">
-					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="parameter1">
-					<parameterValueExpression><![CDATA[$F{columnTitle}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabHeaderCell>
-					<cellContents>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="0" width="90" height="80" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<text><![CDATA[科室财务编码]]></text>
-						</staticText>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="90" y="0" width="200" height="80" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<text><![CDATA[部门]]></text>
-						</staticText>
-					</cellContents>
-				</crosstabHeaderCell>
-				<rowGroup name="rowNum" width="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="290" height="25" forecolor="#000000"/>
-								<box>
-									<pen lineWidth="0.5"/>
-									<topPen lineWidth="0.5"/>
-									<leftPen lineWidth="0.5"/>
-									<bottomPen lineWidth="0.5"/>
-									<rightPen lineWidth="0.5"/>
-								</box>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<rowGroup name="department" width="290" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="90" height="25"/>
-								<box>
-									<pen lineWidth="0.5"/>
-									<topPen lineWidth="0.5"/>
-									<leftPen lineWidth="0.5"/>
-									<bottomPen lineWidth="0.5"/>
-									<rightPen lineWidth="0.5"/>
-								</box>
-								<textElement textAlignment="Left" verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{applicationDepart}==null?"":$V{applicationDepart}.trim()]]></textFieldExpression>
-							</textField>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="90" y="0" width="200" height="25"/>
-								<box>
-									<pen lineWidth="0.5"/>
-									<topPen lineWidth="0.5"/>
-									<leftPen lineWidth="0.5"/>
-									<bottomPen lineWidth="0.5"/>
-									<rightPen lineWidth="0.5"/>
-								</box>
-								<textElement textAlignment="Left" verticalAlignment="Middle">
-									<font size="12"/>
-									<paragraph leftIndent="10"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{department}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<columnGroup name="columnNum" height="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField>
-								<reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="38"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d" x="0" y="0" width="81" height="80"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnName" height="42" headerPosition="Center">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents>
-							<textField>
-								<reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="42" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents/>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{money}]]></measureExpression>
-				</measure>
-				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
-					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
-				</measure>
-				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
-					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
-				</measure>
-				<measure name="applicationDepart" class="java.lang.String">
-					<measureExpression><![CDATA[$F{applicationDepart}]]></measureExpression>
-				</measure>
-				<crosstabCell width="79" height="25">
-					<cellContents>
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="###0.0000">
-							<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="25" rowTotalGroup="rowNum">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="">
-							<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="25" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-							<reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-							<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="0" rowTotalGroup="department">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-			</crosstab>
-		</band>
-	</summary>
-</jasperReport>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<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="monthReport" language="groovy" pageWidth="450" pageHeight="824" columnWidth="450" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
+	<parameter name="title" class="java.lang.String">
+		<parameterDescription><![CDATA[""]]></parameterDescription>
+	</parameter>
+	<parameter name="amountFormat" class="java.lang.String">
+		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
+	</parameter>
+	<parameter name="footerInfo" class="java.lang.String"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="rowNum" class="java.lang.String">
+		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
+	</field>
+	<field name="columnNum" class="java.lang.String">
+		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
+	</field>
+	<field name="columnName" class="java.lang.String">
+		<fieldDescription><![CDATA[columnName]]></fieldDescription>
+	</field>
+	<field name="department" class="java.lang.String">
+		<fieldDescription><![CDATA[department]]></fieldDescription>
+	</field>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
+	</field>
+	<field name="money" class="java.lang.Double">
+		<fieldDescription><![CDATA[money]]></fieldDescription>
+	</field>
+	<field name="columnTitle" class="java.lang.String">
+		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
+	</field>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	</field>
+	<field name="applicationDepart" class="java.lang.String">
+		<fieldDescription><![CDATA[applicationDepart]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="34" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="450" height="34" uuid="14137749-263e-4143-a8dd-482900def002"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<pageFooter>
+		<band height="21">
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="0" width="450" height="20" uuid="b067ffd6-7c60-4499-842e-fbd4965c5fbc"/>
+				<textElement textAlignment="Center"/>
+				<textFieldExpression><![CDATA[$P{footerInfo}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageFooter>
+	<summary>
+		<band height="127" splitType="Stretch">
+			<crosstab>
+				<reportElement x="0" y="0" width="450" height="103" uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c"/>
+				<crosstabParameter name="amountFormatParam">
+					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="parameter1">
+					<parameterValueExpression><![CDATA[$F{columnTitle}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
+				<crosstabHeaderCell>
+					<cellContents>
+						<staticText>
+							<reportElement style="table_TH" x="0" y="0" width="90" height="80" backcolor="#FFFFFF" uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<text><![CDATA[科室财务编码]]></text>
+						</staticText>
+						<staticText>
+							<reportElement style="table_TH" x="90" y="0" width="200" height="80" backcolor="#FFFFFF" uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<text><![CDATA[部门]]></text>
+						</staticText>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="rowNum" width="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement x="0" y="0" width="290" height="25" forecolor="#000000" uuid="1311756a-eafc-440e-926f-b78c03af13a7"/>
+								<box>
+									<pen lineWidth="0.5"/>
+									<topPen lineWidth="0.5"/>
+									<leftPen lineWidth="0.5"/>
+									<bottomPen lineWidth="0.5"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<rowGroup name="department" width="290" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="90" height="25" uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0">
+									<property name="com.jaspersoft.studio.unit.leftIndent" value="px"/>
+								</reportElement>
+								<box>
+									<pen lineWidth="0.5"/>
+									<topPen lineWidth="0.5"/>
+									<leftPen lineWidth="0.5"/>
+									<bottomPen lineWidth="0.5"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
+								<textElement textAlignment="Left" verticalAlignment="Middle">
+									<font size="12"/>
+									<paragraph leftIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{applicationDepart}==null?"":$V{applicationDepart}.trim()]]></textFieldExpression>
+							</textField>
+							<textField textAdjust="StretchHeight">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="90" y="0" width="200" height="25" uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0">
+									<property name="com.jaspersoft.studio.unit.leftIndent" value="px"/>
+								</reportElement>
+								<box>
+									<pen lineWidth="0.5"/>
+									<topPen lineWidth="0.5"/>
+									<leftPen lineWidth="0.5"/>
+									<bottomPen lineWidth="0.5"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
+								<textElement textAlignment="Left" verticalAlignment="Middle">
+									<font size="12"/>
+									<paragraph leftIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{department}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="columnNum" height="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="79" height="38" uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d"/>
+								<textElement verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement x="0" y="0" width="81" height="80" uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnName" height="42" headerPosition="Center">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents>
+							<textField>
+								<reportElement style="table_TH" x="0" y="0" width="79" height="42" backcolor="#FFFFFF" uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
+					<measureExpression><![CDATA[$F{money}]]></measureExpression>
+				</measure>
+				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
+					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
+				</measure>
+				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
+				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
+					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
+				</measure>
+				<measure name="applicationDepart" class="java.lang.String">
+					<measureExpression><![CDATA[$F{applicationDepart}]]></measureExpression>
+				</measure>
+				<crosstabCell width="79" height="25">
+					<cellContents>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="###0.0000">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25" uuid="d304edd7-5900-4bdf-916c-1a90972f5d38">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="79" height="25" rowTotalGroup="rowNum">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="">
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000" uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="25" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25" uuid="8d59cefd-47be-4107-a902-d5fc6d238879">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000" uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="79" height="0" rowTotalGroup="department">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell height="20" rowTotalGroup="rowNum" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jasper
===================================================================
diff -u -r29441 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml
===================================================================
diff -u -r30980 -r35558
--- ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml	(.../monthReportBranche.jrxml)	(revision 30980)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml	(.../monthReportBranche.jrxml)	(revision 35558)
@@ -1,417 +1,436 @@
-<?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="monthReport" language="groovy" pageWidth="468" pageHeight="824" columnWidth="468" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
-	<style name="table">
-		<box>
-			<pen lineWidth="1.0" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
-	<parameter name="title" class="java.lang.String">
-		<parameterDescription><![CDATA[""]]></parameterDescription>
-	</parameter>
-	<parameter name="amountFormat" class="java.lang.String">
-		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="rowNum" class="java.lang.String">
-		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
-	</field>
-	<field name="columnNum" class="java.lang.String">
-		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
-	</field>
-	<field name="columnName" class="java.lang.String">
-		<fieldDescription><![CDATA[columnName]]></fieldDescription>
-	</field>
-	<field name="department" class="java.lang.String">
-		<fieldDescription><![CDATA[department]]></fieldDescription>
-	</field>
-	<field name="amount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[amount]]></fieldDescription>
-	</field>
-	<field name="money" class="java.lang.Double">
-		<fieldDescription><![CDATA[money]]></fieldDescription>
-	</field>
-	<field name="columnTitle" class="java.lang.String">
-		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
-	</field>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
-	</field>
-	<field name="hospitalDistrict" class="java.lang.String">
-		<fieldDescription><![CDATA[hospitalDistrict]]></fieldDescription>
-	</field>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="34" splitType="Stretch">
-			<textField>
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="468" height="34"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<summary>
-		<band height="127" splitType="Stretch">
-			<elementGroup>
-				<crosstab>
-					<reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="468" height="103"/>
-					<crosstabParameter name="amountFormatParam">
-						<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
-					</crosstabParameter>
-					<crosstabHeaderCell>
-						<cellContents>
-							<staticText>
-								<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="0" width="200" height="80" backcolor="#FFFFFF"/>
-								<box>
-									<bottomPen lineWidth="0.0"/>
-								</box>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font isBold="true"/>
-								</textElement>
-								<text><![CDATA[院区]]></text>
-							</staticText>
-							<staticText>
-								<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="200" y="0" width="290" height="80" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font isBold="true"/>
-								</textElement>
-								<text><![CDATA[部门]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabHeaderCell>
-					<rowGroup name="rowNum" width="0" totalPosition="End" headerPosition="Stretch">
-						<bucket class="java.lang.String">
-							<bucketExpression><![CDATA[$F{hospitalDistrict}]]></bucketExpression>
-							<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-						</bucket>
-						<crosstabRowHeader>
-							<cellContents backcolor="#F0F8FF" mode="Opaque">
-								<box>
-									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-							</cellContents>
-						</crosstabRowHeader>
-						<crosstabTotalRowHeader>
-							<cellContents backcolor="#FFFFFF" mode="Transparent">
-								<box>
-									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-								<staticText>
-									<reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="490" height="25" forecolor="#000000" backcolor="#9BC2E6"/>
-									<box>
-										<pen lineWidth="1.0"/>
-										<topPen lineWidth="1.0"/>
-										<leftPen lineWidth="1.0"/>
-										<bottomPen lineWidth="1.0"/>
-										<rightPen lineWidth="1.0"/>
-									</box>
-									<textElement textAlignment="Center" verticalAlignment="Middle">
-										<font isBold="true"/>
-									</textElement>
-									<text><![CDATA[总计]]></text>
-								</staticText>
-							</cellContents>
-						</crosstabTotalRowHeader>
-					</rowGroup>
-					<rowGroup name="hospitalDistrict" width="200" totalPosition="End" headerPosition="Stretch">
-						<bucket class="java.lang.String">
-							<bucketExpression><![CDATA[$F{hospitalDistrict}]]></bucketExpression>
-						</bucket>
-						<crosstabRowHeader>
-							<cellContents>
-								<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-									<reportElement uuid="ee207286-7fd1-4c0c-b6cf-50d1fd4c531a" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Transparent" x="0" y="0" width="200" height="25"/>
-									<box>
-										<pen lineWidth="1.0"/>
-										<topPen lineWidth="0.5"/>
-										<leftPen lineWidth="0.5"/>
-										<bottomPen lineWidth="0.5"/>
-										<rightPen lineWidth="0.5"/>
-									</box>
-									<textElement verticalAlignment="Middle">
-										<font isPdfEmbedded="true"/>
-									</textElement>
-									<textFieldExpression><![CDATA[($V{hospitalDistrict}.contains("ull"))?"":"  "+$V{hospitalDistrict}]]></textFieldExpression>
-								</textField>
-							</cellContents>
-						</crosstabRowHeader>
-						<crosstabTotalRowHeader>
-							<cellContents/>
-						</crosstabTotalRowHeader>
-					</rowGroup>
-					<rowGroup name="department" width="290" totalPosition="End">
-						<bucket class="java.lang.String">
-							<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-							<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-						</bucket>
-						<crosstabRowHeader>
-							<cellContents backcolor="#FFFFFF" mode="Transparent">
-								<box>
-									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-								<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-									<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" mode="Transparent" x="0" y="0" width="290" height="25"/>
-									<box>
-										<pen lineWidth="1.0"/>
-										<topPen lineWidth="1.0"/>
-										<leftPen lineWidth="1.0"/>
-										<bottomPen lineWidth="1.0"/>
-										<rightPen lineWidth="1.0"/>
-									</box>
-									<textElement textAlignment="Left" verticalAlignment="Middle">
-										<font isPdfEmbedded="true"/>
-									</textElement>
-									<textFieldExpression><![CDATA[($V{department}.contains("合计"))?"  合计":"  "+$V{department}]]></textFieldExpression>
-								</textField>
-							</cellContents>
-						</crosstabRowHeader>
-						<crosstabTotalRowHeader>
-							<cellContents backcolor="#BFE1FF" mode="Opaque">
-								<box>
-									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-							</cellContents>
-						</crosstabTotalRowHeader>
-					</rowGroup>
-					<columnGroup name="columnNum" height="0" totalPosition="End">
-						<bucket class="java.lang.String">
-							<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
-						</bucket>
-						<crosstabColumnHeader>
-							<cellContents backcolor="#F0F8FF" mode="Opaque">
-								<box>
-									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-							</cellContents>
-						</crosstabColumnHeader>
-						<crosstabTotalColumnHeader>
-							<cellContents backcolor="#005FB3" mode="Opaque">
-								<box>
-									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-							</cellContents>
-						</crosstabTotalColumnHeader>
-					</columnGroup>
-					<columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch">
-						<bucket class="java.lang.String">
-							<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
-						</bucket>
-						<crosstabColumnHeader>
-							<cellContents backcolor="#FFFFFF" mode="Transparent">
-								<box>
-									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-								<textField>
-									<reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="100" height="38"/>
-									<textElement verticalAlignment="Middle">
-										<font size="12" isBold="true"/>
-									</textElement>
-									<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
-								</textField>
-							</cellContents>
-						</crosstabColumnHeader>
-						<crosstabTotalColumnHeader>
-							<cellContents backcolor="#FFFFFF" mode="Transparent">
-								<box>
-									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-								<staticText>
-									<reportElement uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d" x="0" y="0" width="100" height="80"/>
-									<textElement textAlignment="Center" verticalAlignment="Middle">
-										<font size="12" isBold="true"/>
-									</textElement>
-									<text><![CDATA[合计]]></text>
-								</staticText>
-							</cellContents>
-						</crosstabTotalColumnHeader>
-					</columnGroup>
-					<columnGroup name="columnName" height="42" headerPosition="Center">
-						<bucket class="java.lang.String">
-							<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
-						</bucket>
-						<crosstabColumnHeader>
-							<cellContents>
-								<textField>
-									<reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="100" height="42" backcolor="#FFFFFF"/>
-									<textElement textAlignment="Center" verticalAlignment="Middle">
-										<font size="12" isBold="true"/>
-									</textElement>
-									<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
-								</textField>
-							</cellContents>
-						</crosstabColumnHeader>
-						<crosstabTotalColumnHeader>
-							<cellContents/>
-						</crosstabTotalColumnHeader>
-					</columnGroup>
-					<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
-						<measureExpression><![CDATA[$F{money}]]></measureExpression>
-					</measure>
-					<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
-						<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
-					</measure>
-					<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
-						<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-					</measure>
-					<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
-						<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
-					</measure>
-					<crosstabCell width="100" height="25">
-						<cellContents>
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true" pattern="###0.0000">
-								<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="100" height="25"/>
-								<textElement textAlignment="Right" verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-								<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-							</textField>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell width="100" height="25" rowTotalGroup="rowNum">
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true" pattern="">
-								<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="100" height="25" forecolor="#000000" backcolor="#9BC2E6"/>
-								<box>
-									<pen lineWidth="1.0"/>
-									<topPen lineWidth="1.0"/>
-									<leftPen lineWidth="1.0"/>
-									<bottomPen lineWidth="1.0"/>
-									<rightPen lineWidth="1.0"/>
-								</box>
-								<textElement textAlignment="Right" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}/2:$V{moneyMeasure}/2]]></textFieldExpression>
-								<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-							</textField>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell width="100" height="25" columnTotalGroup="columnTitle">
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true" pattern="">
-								<reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="100" height="25" isRemoveLineWhenBlank="true"/>
-								<textElement textAlignment="Right" verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-								<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-							</textField>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell width="100" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<elementGroup>
-								<textField isStretchWithOverflow="true" pattern="">
-									<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="100" height="25" forecolor="#000000" backcolor="#9BC2E6"/>
-									<box>
-										<pen lineWidth="1.0"/>
-										<topPen lineWidth="1.0"/>
-										<leftPen lineWidth="1.0"/>
-										<bottomPen lineWidth="1.0"/>
-										<rightPen lineWidth="1.0"/>
-									</box>
-									<textElement textAlignment="Right" verticalAlignment="Middle">
-										<font size="12" isBold="true"/>
-									</textElement>
-									<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}/2:$V{moneyMeasure}/2]]></textFieldExpression>
-									<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-								</textField>
-							</elementGroup>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell width="100" height="0" rowTotalGroup="department">
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell width="100" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabCell>
-					<crosstabCell columnTotalGroup="columnName">
-						<cellContents/>
-					</crosstabCell>
-					<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
-						<cellContents/>
-					</crosstabCell>
-					<crosstabCell width="100" height="0" rowTotalGroup="hospitalDistrict">
-						<cellContents/>
-					</crosstabCell>
-					<crosstabCell width="0" height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnNum">
-						<cellContents/>
-					</crosstabCell>
-					<crosstabCell width="100" height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnTitle">
-						<cellContents/>
-					</crosstabCell>
-					<crosstabCell rowTotalGroup="hospitalDistrict" columnTotalGroup="columnName">
-						<cellContents/>
-					</crosstabCell>
-				</crosstab>
-			</elementGroup>
-		</band>
-	</summary>
-</jasperReport>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<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="monthReport" language="groovy" pageWidth="468" pageHeight="824" columnWidth="468" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
+	<parameter name="title" class="java.lang.String">
+		<parameterDescription><![CDATA[""]]></parameterDescription>
+	</parameter>
+	<parameter name="amountFormat" class="java.lang.String">
+		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="rowNum" class="java.lang.String">
+		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
+	</field>
+	<field name="columnNum" class="java.lang.String">
+		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
+	</field>
+	<field name="columnName" class="java.lang.String">
+		<fieldDescription><![CDATA[columnName]]></fieldDescription>
+	</field>
+	<field name="department" class="java.lang.String">
+		<fieldDescription><![CDATA[department]]></fieldDescription>
+	</field>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
+	</field>
+	<field name="money" class="java.lang.Double">
+		<fieldDescription><![CDATA[money]]></fieldDescription>
+	</field>
+	<field name="columnTitle" class="java.lang.String">
+		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
+	</field>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	</field>
+	<field name="hospitalDistrict" class="java.lang.String">
+		<fieldDescription><![CDATA[hospitalDistrict]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="34" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="468" height="34" uuid="14137749-263e-4143-a8dd-482900def002"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<summary>
+		<band height="127" splitType="Stretch">
+			<elementGroup>
+				<crosstab>
+					<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="468" height="103" uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c"/>
+					<crosstabParameter name="amountFormatParam">
+						<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
+					</crosstabParameter>
+					<crosstabDataset>
+						<dataset resetType="Report"/>
+					</crosstabDataset>
+					<crosstabHeaderCell>
+						<cellContents>
+							<staticText>
+								<reportElement style="table_TH" x="0" y="0" width="200" height="80" backcolor="#FFFFFF" uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7"/>
+								<box>
+									<bottomPen lineWidth="0.0"/>
+								</box>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font isBold="true"/>
+								</textElement>
+								<text><![CDATA[院区]]></text>
+							</staticText>
+							<staticText>
+								<reportElement style="table_TH" x="200" y="0" width="290" height="80" backcolor="#FFFFFF" uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font isBold="true"/>
+								</textElement>
+								<text><![CDATA[部门]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabHeaderCell>
+					<rowGroup name="rowNum" width="0" totalPosition="End" headerPosition="Stretch">
+						<bucket class="java.lang.String">
+							<bucketExpression><![CDATA[$F{hospitalDistrict}]]></bucketExpression>
+							<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+						</bucket>
+						<crosstabRowHeader>
+							<cellContents backcolor="#F0F8FF" mode="Opaque">
+								<box>
+									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+								</box>
+							</cellContents>
+						</crosstabRowHeader>
+						<crosstabTotalRowHeader>
+							<cellContents backcolor="#FFFFFF" mode="Transparent">
+								<box>
+									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+								</box>
+								<staticText>
+									<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="490" height="25" forecolor="#000000" backcolor="#9BC2E6" uuid="1311756a-eafc-440e-926f-b78c03af13a7"/>
+									<box>
+										<pen lineWidth="1.0"/>
+										<topPen lineWidth="1.0"/>
+										<leftPen lineWidth="1.0"/>
+										<bottomPen lineWidth="1.0"/>
+										<rightPen lineWidth="1.0"/>
+									</box>
+									<textElement textAlignment="Center" verticalAlignment="Middle">
+										<font isBold="true"/>
+									</textElement>
+									<text><![CDATA[总计]]></text>
+								</staticText>
+							</cellContents>
+						</crosstabTotalRowHeader>
+					</rowGroup>
+					<rowGroup name="hospitalDistrict" width="200" totalPosition="End" headerPosition="Stretch">
+						<bucket class="java.lang.String">
+							<bucketExpression><![CDATA[$F{hospitalDistrict}]]></bucketExpression>
+						</bucket>
+						<crosstabRowHeader>
+							<cellContents>
+								<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+									<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Transparent" x="0" y="0" width="200" height="25" uuid="ee207286-7fd1-4c0c-b6cf-50d1fd4c531a"/>
+									<box>
+										<pen lineWidth="1.0"/>
+										<topPen lineWidth="0.5"/>
+										<leftPen lineWidth="0.5"/>
+										<bottomPen lineWidth="0.5"/>
+										<rightPen lineWidth="0.5"/>
+									</box>
+									<textElement verticalAlignment="Middle">
+										<font isPdfEmbedded="true"/>
+									</textElement>
+									<textFieldExpression><![CDATA[($V{hospitalDistrict}.contains("ull"))?"":"  "+$V{hospitalDistrict}]]></textFieldExpression>
+								</textField>
+							</cellContents>
+						</crosstabRowHeader>
+						<crosstabTotalRowHeader>
+							<cellContents/>
+						</crosstabTotalRowHeader>
+					</rowGroup>
+					<rowGroup name="department" width="290" totalPosition="End">
+						<bucket class="java.lang.String">
+							<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+							<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+						</bucket>
+						<crosstabRowHeader>
+							<cellContents backcolor="#FFFFFF" mode="Transparent">
+								<box>
+									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+								</box>
+								<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+									<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" mode="Transparent" x="0" y="0" width="290" height="25" uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0"/>
+									<box>
+										<pen lineWidth="1.0"/>
+										<topPen lineWidth="1.0"/>
+										<leftPen lineWidth="1.0"/>
+										<bottomPen lineWidth="1.0"/>
+										<rightPen lineWidth="1.0"/>
+									</box>
+									<textElement textAlignment="Left" verticalAlignment="Middle">
+										<font isPdfEmbedded="true"/>
+									</textElement>
+									<textFieldExpression><![CDATA[($V{department}.contains("合计"))?"  合计":"  "+$V{department}]]></textFieldExpression>
+								</textField>
+							</cellContents>
+						</crosstabRowHeader>
+						<crosstabTotalRowHeader>
+							<cellContents backcolor="#BFE1FF" mode="Opaque">
+								<box>
+									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+								</box>
+							</cellContents>
+						</crosstabTotalRowHeader>
+					</rowGroup>
+					<columnGroup name="columnNum" height="0" totalPosition="End">
+						<bucket class="java.lang.String">
+							<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
+						</bucket>
+						<crosstabColumnHeader>
+							<cellContents backcolor="#F0F8FF" mode="Opaque">
+								<box>
+									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+								</box>
+							</cellContents>
+						</crosstabColumnHeader>
+						<crosstabTotalColumnHeader>
+							<cellContents backcolor="#005FB3" mode="Opaque">
+								<box>
+									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+								</box>
+							</cellContents>
+						</crosstabTotalColumnHeader>
+					</columnGroup>
+					<columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch">
+						<bucket class="java.lang.String">
+							<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
+						</bucket>
+						<crosstabColumnHeader>
+							<cellContents backcolor="#FFFFFF" mode="Transparent">
+								<box>
+									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+								</box>
+								<textField>
+									<reportElement style="Crosstab Data Text" x="0" y="0" width="100" height="38" uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d"/>
+									<textElement verticalAlignment="Middle">
+										<font size="12" isBold="true"/>
+									</textElement>
+									<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
+								</textField>
+							</cellContents>
+						</crosstabColumnHeader>
+						<crosstabTotalColumnHeader>
+							<cellContents backcolor="#FFFFFF" mode="Transparent">
+								<box>
+									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+								</box>
+								<staticText>
+									<reportElement x="0" y="0" width="100" height="80" uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d"/>
+									<textElement textAlignment="Center" verticalAlignment="Middle">
+										<font size="12" isBold="true"/>
+									</textElement>
+									<text><![CDATA[合计]]></text>
+								</staticText>
+							</cellContents>
+						</crosstabTotalColumnHeader>
+					</columnGroup>
+					<columnGroup name="columnName" height="42" headerPosition="Center">
+						<bucket class="java.lang.String">
+							<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
+						</bucket>
+						<crosstabColumnHeader>
+							<cellContents>
+								<textField>
+									<reportElement style="table_TH" x="0" y="0" width="100" height="42" backcolor="#FFFFFF" uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d"/>
+									<textElement textAlignment="Center" verticalAlignment="Middle">
+										<font size="12" isBold="true"/>
+									</textElement>
+									<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
+								</textField>
+							</cellContents>
+						</crosstabColumnHeader>
+						<crosstabTotalColumnHeader>
+							<cellContents/>
+						</crosstabTotalColumnHeader>
+					</columnGroup>
+					<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
+						<measureExpression><![CDATA[$F{money}]]></measureExpression>
+					</measure>
+					<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
+						<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
+					</measure>
+					<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
+						<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+					</measure>
+					<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
+						<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
+					</measure>
+					<crosstabCell width="100" height="25">
+						<cellContents>
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight" pattern="###0.0000">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="100" height="25" uuid="d304edd7-5900-4bdf-916c-1a90972f5d38">
+									<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+								</reportElement>
+								<textElement textAlignment="Right" verticalAlignment="Middle">
+									<font size="12"/>
+									<paragraph rightIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+								<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							</textField>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell width="100" height="25" rowTotalGroup="rowNum">
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight" pattern="">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="100" height="25" forecolor="#000000" backcolor="#9BC2E6" uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35">
+									<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+								</reportElement>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement textAlignment="Right" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+									<paragraph rightIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}/2:$V{moneyMeasure}/2]]></textFieldExpression>
+								<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							</textField>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell width="100" height="25" columnTotalGroup="columnTitle">
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight" pattern="">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="100" height="25" isRemoveLineWhenBlank="true" uuid="8d59cefd-47be-4107-a902-d5fc6d238879">
+									<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+								</reportElement>
+								<textElement textAlignment="Right" verticalAlignment="Middle">
+									<font size="12"/>
+									<paragraph rightIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+								<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							</textField>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell width="100" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<elementGroup>
+								<textField textAdjust="StretchHeight" pattern="">
+									<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="100" height="25" forecolor="#000000" backcolor="#9BC2E6" uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111">
+										<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+									</reportElement>
+									<box>
+										<pen lineWidth="1.0"/>
+										<topPen lineWidth="1.0"/>
+										<leftPen lineWidth="1.0"/>
+										<bottomPen lineWidth="1.0"/>
+										<rightPen lineWidth="1.0"/>
+									</box>
+									<textElement textAlignment="Right" verticalAlignment="Middle">
+										<font size="12" isBold="true"/>
+										<paragraph rightIndent="8"/>
+									</textElement>
+									<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}/2:$V{moneyMeasure}/2]]></textFieldExpression>
+									<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+								</textField>
+							</elementGroup>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell width="100" height="0" rowTotalGroup="department">
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell width="100" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabCell>
+					<crosstabCell columnTotalGroup="columnName">
+						<cellContents/>
+					</crosstabCell>
+					<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
+						<cellContents/>
+					</crosstabCell>
+					<crosstabCell width="100" height="0" rowTotalGroup="hospitalDistrict">
+						<cellContents/>
+					</crosstabCell>
+					<crosstabCell width="0" height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnNum">
+						<cellContents/>
+					</crosstabCell>
+					<crosstabCell width="100" height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnTitle">
+						<cellContents/>
+					</crosstabCell>
+					<crosstabCell rowTotalGroup="hospitalDistrict" columnTotalGroup="columnName">
+						<cellContents/>
+					</crosstabCell>
+					<crosstabCell height="20" rowTotalGroup="rowNum" columnTotalGroup="columnName">
+						<cellContents/>
+					</crosstabCell>
+				</crosstab>
+			</elementGroup>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jrxml
===================================================================
diff -u -r29441 -r35558
--- ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jrxml	(.../strengthenStatisticalWorkload.jrxml)	(revision 29441)
+++ ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jrxml	(.../strengthenStatisticalWorkload.jrxml)	(revision 35558)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="workload" language="groovy" pageWidth="309" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="309" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b6209d28-6c93-40a9-beb3-71a741da002e">
 	<property name="ireport.zoom" value="0.6830134553650713"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -57,7 +58,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="0" width="2200" height="30"/>
+				<reportElement x="0" y="0" width="2200" height="30" uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
@@ -68,11 +69,14 @@
 	<summary>
 		<band height="30" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="2200" height="30"/>
+				<reportElement x="0" y="0" width="2200" height="30" uuid="648fe906-6aed-4eff-8977-38ddace66c2c"/>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8" style="table_TH" x="0" y="0" width="76" height="40" backcolor="#FFFFFF"/>
+							<reportElement style="table_TH" x="0" y="0" width="76" height="40" backcolor="#FFFFFF" uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -97,7 +101,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d" style="table_TD" mode="Opaque" x="0" y="0" width="76" height="25"/>
+								<reportElement style="table_TD" mode="Opaque" x="0" y="0" width="76" height="25" uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="14"/>
 								</textElement>
@@ -111,7 +115,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a" x="0" y="0" width="76" height="25"/>
+								<reportElement x="0" y="0" width="76" height="25" uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a"/>
 								<box>
 									<pen lineWidth="0.5"/>
 									<topPen lineWidth="0.5"/>
@@ -144,7 +148,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" x="0" y="0" width="43" height="40" forecolor="#000000"/>
+								<reportElement style="table_CH" x="0" y="0" width="43" height="40" forecolor="#000000" uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="14" isBold="true"/>
 								</textElement>
@@ -163,7 +167,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="190" height="20"/>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="190" height="20" uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -177,7 +181,7 @@
 								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
 							</textField>
 							<staticText>
-								<reportElement uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127" style="Crosstab Data Text" x="0" y="20" width="75" height="20"/>
+								<reportElement style="Crosstab Data Text" x="0" y="20" width="75" height="20" uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -191,7 +195,7 @@
 								<text><![CDATA[包数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="db370b31-880c-44a3-a8e1-ba9570c3262f" style="Crosstab Data Text" x="75" y="20" width="75" height="20"/>
+								<reportElement style="Crosstab Data Text" x="75" y="20" width="75" height="20" uuid="db370b31-880c-44a3-a8e1-ba9570c3262f"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -205,7 +209,7 @@
 								<text><![CDATA[件数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="fb8589c5-0e02-42dd-a7a4-59b371a85877" style="Crosstab Data Text" mode="Opaque" x="150" y="20" width="40" height="20" backcolor="#CCFFCC"/>
+								<reportElement style="Crosstab Data Text" mode="Opaque" x="150" y="20" width="40" height="20" backcolor="#CCFFCC" uuid="fb8589c5-0e02-42dd-a7a4-59b371a85877"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -243,7 +247,9 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField pattern="" isBlankWhenNull="false">
-							<reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="table_TD" mode="Opaque" x="0" y="0" width="75" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+							<reportElement style="table_TD" mode="Opaque" x="0" y="0" width="75" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="1de502ee-792a-4517-ae65-33bb35ce3412">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -253,12 +259,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 								<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
+								<paragraph lineSpacing="Single" rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a" style="table_TD" x="75" y="0" width="75" height="25"/>
+							<reportElement style="table_TD" x="75" y="0" width="75" height="25" uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -268,11 +276,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="c0b0fff6-222c-40bc-aa1c-b4ce2e96b542" style="Crosstab Data Text" mode="Opaque" x="150" y="0" width="40" height="25" backcolor="#CCFFCC"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="150" y="0" width="40" height="25" backcolor="#CCFFCC" uuid="c0b0fff6-222c-40bc-aa1c-b4ce2e96b542">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -282,6 +293,7 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
@@ -293,24 +305,32 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="table_CH" x="0" y="0" width="75" height="25"/>
+							<reportElement style="table_CH" x="0" y="0" width="75" height="25" uuid="e277e6b2-eb9d-409f-b558-226f59b070e9">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="4d5762e5-7d05-4067-a81e-93e4012380dd" style="table_CH" x="75" y="0" width="75" height="25"/>
+							<reportElement style="table_CH" x="75" y="0" width="75" height="25" uuid="4d5762e5-7d05-4067-a81e-93e4012380dd">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField pattern="" isBlankWhenNull="false">
-							<reportElement uuid="a564467a-ca21-4baa-a759-8dbe37e3ba9f" style="table_CH" mode="Opaque" x="150" y="0" width="40" height="25" forecolor="#000000" backcolor="#BFE1FF"/>
+							<reportElement style="table_CH" mode="Opaque" x="150" y="0" width="40" height="25" forecolor="#000000" backcolor="#BFE1FF" uuid="a564467a-ca21-4baa-a759-8dbe37e3ba9f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 								<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
+								<paragraph lineSpacing="Single" rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
@@ -322,9 +342,12 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="0" y="0" width="43" height="25"/>
+							<reportElement style="table_CH" x="0" y="0" width="43" height="25" uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
@@ -336,8 +359,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<staticText>
-							<reportElement uuid="f9eeca90-2b09-46f3-a51f-2615aee39619" style="table_CH" x="0" y="0" width="43" height="25"/>
-							<textElement/>
+							<reportElement style="table_CH" x="0" y="0" width="43" height="25" uuid="f9eeca90-2b09-46f3-a51f-2615aee39619"/>
 							<text><![CDATA[]]></text>
 						</staticText>
 					</cellContents>
Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jasper
===================================================================
diff -u -r33775 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/statisticalWorkloadDisposableGood.jasper
===================================================================
diff -u -r29449 -r35558
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml
===================================================================
diff -u -r29441 -r35558
--- ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml	(.../strengthenStatisticalWorkloadDisposableGood.jrxml)	(revision 29441)
+++ ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml	(.../strengthenStatisticalWorkloadDisposableGood.jrxml)	(revision 35558)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="workload" language="groovy" pageWidth="309" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="309" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b6209d28-6c93-40a9-beb3-71a741da002e">
 	<property name="ireport.zoom" value="0.6830134553650713"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -61,7 +62,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="0" width="2200" height="30"/>
+				<reportElement x="0" y="0" width="2200" height="30" uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
@@ -72,14 +73,17 @@
 	<summary>
 		<band height="30" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="2200" height="30"/>
+				<reportElement x="0" y="0" width="2200" height="30" uuid="648fe906-6aed-4eff-8977-38ddace66c2c"/>
 				<crosstabParameter name="parameter1">
 					<parameterValueExpression><![CDATA[$P{showDisposableGoods}]]></parameterValueExpression>
 				</crosstabParameter>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8" style="table_TH" x="0" y="0" width="76" height="40" backcolor="#FFFFFF"/>
+							<reportElement style="table_TH" x="0" y="0" width="76" height="40" backcolor="#FFFFFF" uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -104,7 +108,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d" style="table_TD" mode="Opaque" x="0" y="0" width="76" height="25"/>
+								<reportElement style="table_TD" mode="Opaque" x="0" y="0" width="76" height="25" uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="14"/>
 								</textElement>
@@ -118,7 +122,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a" x="0" y="0" width="76" height="25"/>
+								<reportElement x="0" y="0" width="76" height="25" uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a"/>
 								<box>
 									<pen lineWidth="0.5"/>
 									<topPen lineWidth="0.5"/>
@@ -151,14 +155,14 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" x="0" y="0" width="43" height="40" forecolor="#000000"/>
+								<reportElement style="table_CH" x="0" y="0" width="43" height="40" forecolor="#000000" uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font isBold="true"/>
 								</textElement>
 								<text><![CDATA[总评分]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" mode="Opaque" x="43" y="0" width="95" height="40" forecolor="#000000"/>
+								<reportElement style="table_CH" mode="Opaque" x="43" y="0" width="95" height="40" forecolor="#000000" uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font isBold="true"/>
 									<paragraph lineSpacing="1_1_2"/>
@@ -178,7 +182,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="190" height="20"/>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="190" height="20" uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -192,7 +196,7 @@
 								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
 							</textField>
 							<staticText>
-								<reportElement uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127" style="Crosstab Data Text" x="0" y="20" width="75" height="20"/>
+								<reportElement style="Crosstab Data Text" x="0" y="20" width="75" height="20" uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -206,7 +210,7 @@
 								<text><![CDATA[包数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="db370b31-880c-44a3-a8e1-ba9570c3262f" style="Crosstab Data Text" x="75" y="20" width="75" height="20"/>
+								<reportElement style="Crosstab Data Text" x="75" y="20" width="75" height="20" uuid="db370b31-880c-44a3-a8e1-ba9570c3262f"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -220,7 +224,7 @@
 								<text><![CDATA[件数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="fb8589c5-0e02-42dd-a7a4-59b371a85877" style="Crosstab Data Text" mode="Opaque" x="150" y="20" width="40" height="20" backcolor="#CCFFCC"/>
+								<reportElement style="Crosstab Data Text" mode="Opaque" x="150" y="20" width="40" height="20" backcolor="#CCFFCC" uuid="fb8589c5-0e02-42dd-a7a4-59b371a85877"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -261,7 +265,9 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField pattern="" isBlankWhenNull="false">
-							<reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="table_TD" mode="Opaque" x="0" y="0" width="75" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+							<reportElement style="table_TD" mode="Opaque" x="0" y="0" width="75" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="1de502ee-792a-4517-ae65-33bb35ce3412">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -271,12 +277,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 								<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
+								<paragraph lineSpacing="Single" rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a" style="table_TD" x="75" y="0" width="75" height="25"/>
+							<reportElement style="table_TD" x="75" y="0" width="75" height="25" uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -286,11 +294,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="c0b0fff6-222c-40bc-aa1c-b4ce2e96b542" style="Crosstab Data Text" mode="Opaque" x="150" y="0" width="40" height="25" backcolor="#CCFFCC"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="150" y="0" width="40" height="25" backcolor="#CCFFCC" uuid="c0b0fff6-222c-40bc-aa1c-b4ce2e96b542">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -300,6 +311,7 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
@@ -311,24 +323,32 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="table_CH" x="0" y="0" width="75" height="25"/>
+							<reportElement style="table_CH" x="0" y="0" width="75" height="25" uuid="e277e6b2-eb9d-409f-b558-226f59b070e9">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="4d5762e5-7d05-4067-a81e-93e4012380dd" style="table_CH" x="75" y="0" width="75" height="25"/>
+							<reportElement style="table_CH" x="75" y="0" width="75" height="25" uuid="4d5762e5-7d05-4067-a81e-93e4012380dd">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField pattern="" isBlankWhenNull="false">
-							<reportElement uuid="a564467a-ca21-4baa-a759-8dbe37e3ba9f" style="table_CH" mode="Opaque" x="150" y="0" width="40" height="25" forecolor="#000000" backcolor="#BFE1FF"/>
+							<reportElement style="table_CH" mode="Opaque" x="150" y="0" width="40" height="25" forecolor="#000000" backcolor="#BFE1FF" uuid="a564467a-ca21-4baa-a759-8dbe37e3ba9f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 								<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
+								<paragraph lineSpacing="Single" rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
@@ -340,16 +360,22 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="0" y="0" width="43" height="25"/>
+							<reportElement style="table_CH" x="0" y="0" width="43" height="25" uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="8"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
 						<textField isBlankWhenNull="true">
-							<reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="43" y="0" width="95" height="25"/>
+							<reportElement style="table_CH" x="43" y="0" width="95" height="25" uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="8"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{disposableGoodAmountMeasure}]]></textFieldExpression>
 						</textField>
@@ -361,7 +387,9 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField isBlankWhenNull="true">
-							<reportElement uuid="31961583-d6f6-4d84-b526-90bd59ead2ac" style="Crosstab Data Text" mode="Opaque" x="43" y="0" width="95" height="25" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" backcolor="#BFE1FF"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="43" y="0" width="95" height="25" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" backcolor="#BFE1FF" uuid="31961583-d6f6-4d84-b526-90bd59ead2ac">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -371,11 +399,12 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="8"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{disposableGoodAmountMeasure}]]></textFieldExpression>
 						</textField>
 						<staticText>
-							<reportElement uuid="aa794333-b763-4baf-8b0b-5714c41f42f2" style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="43" height="25" backcolor="#BFE1FF"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="43" height="25" backcolor="#BFE1FF" uuid="aa794333-b763-4baf-8b0b-5714c41f42f2"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml
===================================================================
diff -u -r30980 -r35558
--- ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml	(.../monthReportShowApplicationDepart.jrxml)	(revision 30980)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml	(.../monthReportShowApplicationDepart.jrxml)	(revision 35558)
@@ -1,417 +1,438 @@
-<?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="monthReport" language="groovy" pageWidth="450" pageHeight="824" columnWidth="450" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
-	<style name="table">
-		<box>
-			<pen lineWidth="1.0" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
-	<parameter name="title" class="java.lang.String">
-		<parameterDescription><![CDATA[""]]></parameterDescription>
-	</parameter>
-	<parameter name="amountFormat" class="java.lang.String">
-		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
-	</parameter>
-	<parameter name="applicationDepartShowName" class="java.lang.String">
-		<defaultValueExpression><![CDATA[applicationDepartShowName]]></defaultValueExpression>
-	</parameter>
-	<parameter name="settleAccountsDepartShowName" class="java.lang.String">
-		<defaultValueExpression><![CDATA[settleAccountsDepartShowName]]></defaultValueExpression>
-	</parameter>
-	<parameter name="sumPriceShowName" class="java.lang.String">
-		<defaultValueExpression><![CDATA[sumPriceShowName]]></defaultValueExpression>
-	</parameter>
-	<parameter name="sumAmountShowName" class="java.lang.String">
-		<defaultValueExpression><![CDATA[sumAmountShowName]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="rowNum" class="java.lang.String">
-		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
-	</field>
-	<field name="columnNum" class="java.lang.String">
-		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
-	</field>
-	<field name="columnName" class="java.lang.String">
-		<fieldDescription><![CDATA[columnName]]></fieldDescription>
-	</field>
-	<field name="department" class="java.lang.String">
-		<fieldDescription><![CDATA[department]]></fieldDescription>
-	</field>
-	<field name="amount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[amount]]></fieldDescription>
-	</field>
-	<field name="money" class="java.lang.Double">
-		<fieldDescription><![CDATA[money]]></fieldDescription>
-	</field>
-	<field name="columnTitle" class="java.lang.String">
-		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
-	</field>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
-	</field>
-	<field name="applicationDepart" class="java.lang.String">
-		<fieldDescription><![CDATA[applicationDepart]]></fieldDescription>
-	</field>
-	<variable name="maxAmount" class="java.lang.Integer" calculation="Highest">
-		<variableExpression><![CDATA[$F{amount}]]></variableExpression>
-	</variable>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="34" splitType="Stretch">
-			<textField>
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="450" height="34"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<summary>
-		<band height="127" splitType="Stretch">
-			<crosstab>
-				<reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="450" height="103"/>
-				<crosstabParameter name="amountFormatParam">
-					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="appDepartShowNameParam">
-					<parameterValueExpression><![CDATA[$P{applicationDepartShowName}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="setDepartShowNameParam">
-					<parameterValueExpression><![CDATA[$P{settleAccountsDepartShowName}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="sumPriceShowNameParam">
-					<parameterValueExpression><![CDATA[$P{sumPriceShowName}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="sumAmountShowNameParam">
-					<parameterValueExpression><![CDATA[$P{sumAmountShowName}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabHeaderCell>
-					<cellContents>
-						<textField isBlankWhenNull="true">
-							<reportElement uuid="08fc6f93-10d2-4d55-8b65-3e3d2f0f7aa9" style="table_TH" x="0" y="0" width="153" height="95" backcolor="#FFFFFF"/>
-							<box>
-								<pen lineWidth="0.5"/>
-								<topPen lineWidth="0.5"/>
-								<leftPen lineWidth="0.5"/>
-								<bottomPen lineWidth="0.5"/>
-								<rightPen lineWidth="0.5"/>
-							</box>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[$P{appDepartShowNameParam}]]></textFieldExpression>
-						</textField>
-						<textField isBlankWhenNull="true">
-							<reportElement uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a" style="table_TH" x="153" y="0" width="153" height="95" backcolor="#FFFFFF"/>
-							<box>
-								<pen lineWidth="0.5"/>
-								<topPen lineWidth="0.5"/>
-								<leftPen lineWidth="0.5"/>
-								<bottomPen lineWidth="0.5"/>
-								<rightPen lineWidth="0.5"/>
-							</box>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[$P{setDepartShowNameParam}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabHeaderCell>
-				<rowGroup name="rowNum" width="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="306" height="25" forecolor="#000000"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<rowGroup name="department" width="306" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-								<reportElement uuid="dcbc7276-883b-4b54-9de2-1123a51a99bc" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25"/>
-								<box>
-									<pen lineWidth="0.5"/>
-									<topPen lineWidth="0.5"/>
-									<leftPen lineWidth="0.5"/>
-									<bottomPen lineWidth="0.5"/>
-									<rightPen lineWidth="0.5"/>
-								</box>
-								<textElement textAlignment="Left" verticalAlignment="Middle">
-									<font size="12"/>
-									<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{applicationDepart}==null?"":"  "+$V{applicationDepart}]]></textFieldExpression>
-							</textField>
-							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="table_TD" stretchType="RelativeToBandHeight" x="153" y="0" width="153" height="25"/>
-								<box>
-									<pen lineWidth="1.0"/>
-									<topPen lineWidth="1.0"/>
-									<leftPen lineWidth="1.0"/>
-									<bottomPen lineWidth="1.0"/>
-									<rightPen lineWidth="1.0"/>
-								</box>
-								<textElement textAlignment="Left" verticalAlignment="Middle">
-									<font size="12"/>
-									<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{department}==null?"":"  "+$V{department}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<columnGroup name="columnNum" height="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnTitle" height="0" totalPosition="End" headerPosition="Stretch">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField>
-								<reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="0"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{maxAmount}>0||$V{amountMeasure}!=0?$P{sumAmountShowNameParam}:$P{sumPriceShowNameParam}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnName" height="95" headerPosition="Center">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents>
-							<textField isBlankWhenNull="true">
-								<reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-									<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents/>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{money}]]></measureExpression>
-				</measure>
-				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
-					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
-				</measure>
-				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="maxAmount" class="java.lang.Integer" calculation="Highest">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="applicationDepart" class="java.lang.String">
-					<measureExpression><![CDATA[$F{applicationDepart}]]></measureExpression>
-				</measure>
-				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
-					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
-				</measure>
-				<crosstabCell width="100" height="25">
-					<cellContents>
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="###0.0000">
-							<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12"/>
-								<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="25" rowTotalGroup="rowNum">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-							<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="25" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-							<reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12"/>
-								<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-							<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="0" rowTotalGroup="department">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="100" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-			</crosstab>
-		</band>
-	</summary>
-</jasperReport>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<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="monthReport" language="groovy" pageWidth="450" pageHeight="824" columnWidth="450" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
+	<parameter name="title" class="java.lang.String">
+		<parameterDescription><![CDATA[""]]></parameterDescription>
+	</parameter>
+	<parameter name="amountFormat" class="java.lang.String">
+		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
+	</parameter>
+	<parameter name="applicationDepartShowName" class="java.lang.String">
+		<defaultValueExpression><![CDATA[applicationDepartShowName]]></defaultValueExpression>
+	</parameter>
+	<parameter name="settleAccountsDepartShowName" class="java.lang.String">
+		<defaultValueExpression><![CDATA[settleAccountsDepartShowName]]></defaultValueExpression>
+	</parameter>
+	<parameter name="sumPriceShowName" class="java.lang.String">
+		<defaultValueExpression><![CDATA[sumPriceShowName]]></defaultValueExpression>
+	</parameter>
+	<parameter name="sumAmountShowName" class="java.lang.String">
+		<defaultValueExpression><![CDATA[sumAmountShowName]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="rowNum" class="java.lang.String">
+		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
+	</field>
+	<field name="columnNum" class="java.lang.String">
+		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
+	</field>
+	<field name="columnName" class="java.lang.String">
+		<fieldDescription><![CDATA[columnName]]></fieldDescription>
+	</field>
+	<field name="department" class="java.lang.String">
+		<fieldDescription><![CDATA[department]]></fieldDescription>
+	</field>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
+	</field>
+	<field name="money" class="java.lang.Double">
+		<fieldDescription><![CDATA[money]]></fieldDescription>
+	</field>
+	<field name="columnTitle" class="java.lang.String">
+		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
+	</field>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	</field>
+	<field name="applicationDepart" class="java.lang.String">
+		<fieldDescription><![CDATA[applicationDepart]]></fieldDescription>
+	</field>
+	<variable name="maxAmount" class="java.lang.Integer" calculation="Highest">
+		<variableExpression><![CDATA[$F{amount}]]></variableExpression>
+	</variable>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="34" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="450" height="34" uuid="14137749-263e-4143-a8dd-482900def002"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<summary>
+		<band height="127" splitType="Stretch">
+			<crosstab>
+				<reportElement x="0" y="0" width="450" height="103" uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c"/>
+				<crosstabParameter name="amountFormatParam">
+					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="appDepartShowNameParam">
+					<parameterValueExpression><![CDATA[$P{applicationDepartShowName}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="setDepartShowNameParam">
+					<parameterValueExpression><![CDATA[$P{settleAccountsDepartShowName}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="sumPriceShowNameParam">
+					<parameterValueExpression><![CDATA[$P{sumPriceShowName}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="sumAmountShowNameParam">
+					<parameterValueExpression><![CDATA[$P{sumAmountShowName}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
+				<crosstabHeaderCell>
+					<cellContents>
+						<textField isBlankWhenNull="true">
+							<reportElement style="table_TH" x="0" y="0" width="153" height="95" backcolor="#FFFFFF" uuid="08fc6f93-10d2-4d55-8b65-3e3d2f0f7aa9"/>
+							<box>
+								<pen lineWidth="0.5"/>
+								<topPen lineWidth="0.5"/>
+								<leftPen lineWidth="0.5"/>
+								<bottomPen lineWidth="0.5"/>
+								<rightPen lineWidth="0.5"/>
+							</box>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$P{appDepartShowNameParam}]]></textFieldExpression>
+						</textField>
+						<textField isBlankWhenNull="true">
+							<reportElement style="table_TH" x="153" y="0" width="153" height="95" backcolor="#FFFFFF" uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a"/>
+							<box>
+								<pen lineWidth="0.5"/>
+								<topPen lineWidth="0.5"/>
+								<leftPen lineWidth="0.5"/>
+								<bottomPen lineWidth="0.5"/>
+								<rightPen lineWidth="0.5"/>
+							</box>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$P{setDepartShowNameParam}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="rowNum" width="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="306" height="25" forecolor="#000000" uuid="1311756a-eafc-440e-926f-b78c03af13a7"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<rowGroup name="department" width="306" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25" uuid="dcbc7276-883b-4b54-9de2-1123a51a99bc">
+									<property name="com.jaspersoft.studio.unit.leftIndent" value="px"/>
+								</reportElement>
+								<box>
+									<pen lineWidth="0.5"/>
+									<topPen lineWidth="0.5"/>
+									<leftPen lineWidth="0.5"/>
+									<bottomPen lineWidth="0.5"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
+								<textElement textAlignment="Left" verticalAlignment="Middle">
+									<font size="12"/>
+									<paragraph lineSpacing="Proportional" lineSpacingSize="1.2" leftIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{applicationDepart}==null?"":"  "+$V{applicationDepart}]]></textFieldExpression>
+							</textField>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="153" y="0" width="153" height="25" uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0">
+									<property name="com.jaspersoft.studio.unit.leftIndent" value="px"/>
+								</reportElement>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement textAlignment="Left" verticalAlignment="Middle">
+									<font size="12"/>
+									<paragraph lineSpacing="Proportional" lineSpacingSize="1.2" leftIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{department}==null?"":"  "+$V{department}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="columnNum" height="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnTitle" height="0" totalPosition="End" headerPosition="Stretch">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="79" height="0" uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d"/>
+								<textElement verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight">
+								<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF" uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{maxAmount}>0||$V{amountMeasure}!=0?$P{sumAmountShowNameParam}:$P{sumPriceShowNameParam}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnName" height="95" headerPosition="Center">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents>
+							<textField isBlankWhenNull="true">
+								<reportElement style="table_TH" x="0" y="0" width="100" height="95" backcolor="#FFFFFF" uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+									<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
+					<measureExpression><![CDATA[$F{money}]]></measureExpression>
+				</measure>
+				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
+					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
+				</measure>
+				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
+				<measure name="maxAmount" class="java.lang.Integer" calculation="Highest">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
+				<measure name="applicationDepart" class="java.lang.String">
+					<measureExpression><![CDATA[$F{applicationDepart}]]></measureExpression>
+				</measure>
+				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
+					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
+				</measure>
+				<crosstabCell width="100" height="25">
+					<cellContents>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="###0.0000">
+							<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" uuid="d304edd7-5900-4bdf-916c-1a90972f5d38">
+								<property name="com.jaspersoft.studio.unit.leftIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Left" verticalAlignment="Middle">
+								<font size="12"/>
+								<paragraph lineSpacing="Proportional" lineSpacingSize="1.2" leftIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="25" rowTotalGroup="rowNum">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="" isBlankWhenNull="true">
+							<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000" uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35">
+								<property name="com.jaspersoft.studio.unit.leftIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Left" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph leftIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="25" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="" isBlankWhenNull="true">
+							<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" uuid="8d59cefd-47be-4107-a902-d5fc6d238879">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12"/>
+								<paragraph lineSpacing="Proportional" lineSpacingSize="1.2" rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="" isBlankWhenNull="true">
+							<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000" uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="0" rowTotalGroup="department">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="100" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell height="20" rowTotalGroup="rowNum" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/statisticalWorkloadDisposableGood.jrxml
===================================================================
diff -u -r29449 -r35558
--- ssts-web/src/main/webapp/jasperRtp/statisticalWorkloadDisposableGood.jrxml	(.../statisticalWorkloadDisposableGood.jrxml)	(revision 29449)
+++ ssts-web/src/main/webapp/jasperRtp/statisticalWorkloadDisposableGood.jrxml	(.../statisticalWorkloadDisposableGood.jrxml)	(revision 35558)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="workload" language="groovy" pageWidth="309" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="309" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b6209d28-6c93-40a9-beb3-71a741da002e">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -60,7 +61,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="0" width="2200" height="30"/>
+				<reportElement x="0" y="0" width="2200" height="30" uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
@@ -71,11 +72,14 @@
 	<summary>
 		<band height="30" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="2200" height="30" backcolor="#CCFFCC"/>
+				<reportElement x="0" y="0" width="2200" height="30" backcolor="#CCFFCC" uuid="648fe906-6aed-4eff-8977-38ddace66c2c"/>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8" style="table_TH" x="0" y="0" width="70" height="55" backcolor="#FFFFFF"/>
+							<reportElement style="table_TH" x="0" y="0" width="70" height="55" backcolor="#FFFFFF" uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -100,7 +104,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d" style="table_TD" mode="Opaque" x="0" y="0" width="70" height="30"/>
+								<reportElement style="table_TD" mode="Opaque" x="0" y="0" width="70" height="30" uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="14"/>
 								</textElement>
@@ -114,7 +118,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a" x="0" y="0" width="70" height="30"/>
+								<reportElement x="0" y="0" width="70" height="30" uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a"/>
 								<box>
 									<pen lineWidth="0.5"/>
 									<topPen lineWidth="0.5"/>
@@ -147,7 +151,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" x="0" y="0" width="95" height="55" forecolor="#000000" backcolor="#FFFFFF"/>
+								<reportElement style="table_CH" x="0" y="0" width="95" height="55" forecolor="#000000" backcolor="#FFFFFF" uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="14" isBold="true"/>
 									<paragraph lineSpacing="1_1_2"/>
@@ -167,7 +171,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="150" height="30"/>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="150" height="30" uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -181,7 +185,7 @@
 								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
 							</textField>
 							<staticText>
-								<reportElement uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127" style="Crosstab Data Text" x="0" y="30" width="75" height="25"/>
+								<reportElement style="Crosstab Data Text" x="0" y="30" width="75" height="25" uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -195,7 +199,7 @@
 								<text><![CDATA[包数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="db370b31-880c-44a3-a8e1-ba9570c3262f" style="Crosstab Data Text" mode="Opaque" x="75" y="30" width="75" height="25" backcolor="#CCFFCC"/>
+								<reportElement style="Crosstab Data Text" mode="Opaque" x="75" y="30" width="75" height="25" backcolor="#CCFFCC" uuid="db370b31-880c-44a3-a8e1-ba9570c3262f"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -236,7 +240,9 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField pattern="###0" isBlankWhenNull="false">
-							<reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="table_TD" mode="Opaque" x="0" y="0" width="75" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+							<reportElement style="table_TD" mode="Opaque" x="0" y="0" width="75" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="1de502ee-792a-4517-ae65-33bb35ce3412">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -246,12 +252,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 								<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
+								<paragraph lineSpacing="Single" rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a" style="table_TD" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC"/>
+							<reportElement style="table_TD" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC" uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -261,6 +269,7 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
@@ -272,14 +281,19 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="table_CH" x="0" y="0" width="75" height="30"/>
+							<reportElement style="table_CH" x="0" y="0" width="75" height="30" uuid="e277e6b2-eb9d-409f-b558-226f59b070e9">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="4d5762e5-7d05-4067-a81e-93e4012380dd" style="table_CH" x="75" y="0" width="75" height="30" backcolor="#CCFFCC"/>
+							<reportElement style="table_CH" x="75" y="0" width="75" height="30" backcolor="#CCFFCC" uuid="4d5762e5-7d05-4067-a81e-93e4012380dd">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -289,6 +303,7 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
@@ -300,7 +315,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="0" y="0" width="95" height="30" backcolor="#FFFFFF"/>
+							<reportElement style="table_CH" x="0" y="0" width="95" height="30" backcolor="#FFFFFF" uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f"/>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
 								<paragraph rightIndent="8"/>
@@ -315,7 +330,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="fb60eba0-5e25-4489-a8bd-8eeb3e7e7ba7" style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="95" height="30" forecolor="#000000" backcolor="#BFE1FF"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="95" height="30" forecolor="#000000" backcolor="#BFE1FF" uuid="fb60eba0-5e25-4489-a8bd-8eeb3e7e7ba7"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
Index: ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml
===================================================================
diff -u -r30980 -r35558
--- ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml	(.../monthIntegralReport.jrxml)	(revision 30980)
+++ ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml	(.../monthIntegralReport.jrxml)	(revision 35558)
@@ -1,388 +1,413 @@
-<?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="monthReport" language="groovy" pageWidth="450" pageHeight="824" columnWidth="450" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
-	<style name="table">
-		<box>
-			<pen lineWidth="1.0" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
-	<parameter name="title" class="java.lang.String">
-		<parameterDescription><![CDATA[""]]></parameterDescription>
-	</parameter>
-	<parameter name="totalIntegral" class="java.lang.Double">
-		<parameterDescription><![CDATA[0.00]]></parameterDescription>
-	</parameter>
-	<parameter name="amountFormat" class="java.lang.String">
-		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="rowNum" class="java.lang.String">
-		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
-	</field>
-	<field name="columnNum" class="java.lang.String">
-		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
-	</field>
-	<field name="columnName" class="java.lang.String">
-		<fieldDescription><![CDATA[columnName]]></fieldDescription>
-	</field>
-	<field name="department" class="java.lang.String">
-		<fieldDescription><![CDATA[department]]></fieldDescription>
-	</field>
-	<field name="amount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[amount]]></fieldDescription>
-	</field>
-	<field name="money" class="java.lang.Double">
-		<fieldDescription><![CDATA[money]]></fieldDescription>
-	</field>
-	<field name="columnTitle" class="java.lang.String">
-		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
-	</field>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
-	</field>
-	<field name="integral" class="java.lang.Double">
-		<fieldDescription><![CDATA[integral]]></fieldDescription>
-	</field>
-	<variable name="variable1" class="java.lang.String"/>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="34" splitType="Stretch">
-			<textField>
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="450" height="34"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<summary>
-		<band height="127" splitType="Stretch">
-			<crosstab>
-				<reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="450" height="103"/>
-				<crosstabParameter name="integral" class="java.lang.Double">
-					<parameterValueExpression><![CDATA[$F{integral}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="totalIntegralPara" class="java.lang.Double">
-					<parameterValueExpression><![CDATA[$P{totalIntegral}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="amountFormatParam">
-					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabHeaderCell>
-					<cellContents>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="0" width="290" height="80" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<text><![CDATA[部门]]></text>
-						</staticText>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="290" y="0" width="79" height="80" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<text><![CDATA[积分]]></text>
-						</staticText>
-					</cellContents>
-				</crosstabHeaderCell>
-				<rowGroup name="rowNum" width="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="290" height="25" forecolor="#000000"/>
-								<box>
-									<pen lineWidth="0.5"/>
-									<topPen lineWidth="0.5"/>
-									<leftPen lineWidth="0.5"/>
-									<bottomPen lineWidth="0.5"/>
-									<rightPen lineWidth="0.5"/>
-								</box>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计]]></text>
-							</staticText>
-							<textField pattern="###0.00">
-								<reportElement uuid="8d892ca4-a179-4ef5-82c9-acd818c16d70" style="Crosstab Data Text" x="290" y="0" width="79" height="25"/>
-								<textElement textAlignment="Right" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$P{totalIntegralPara}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<rowGroup name="department" width="369" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="290" height="25"/>
-								<box>
-									<pen lineWidth="0.5"/>
-									<topPen lineWidth="0.5"/>
-									<leftPen lineWidth="0.5"/>
-									<bottomPen lineWidth="0.5"/>
-									<rightPen lineWidth="0.5"/>
-								</box>
-								<textElement verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{department}]]></textFieldExpression>
-							</textField>
-							<textField isStretchWithOverflow="true" pattern="###0.00">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="290" y="0" width="79" height="25"/>
-								<textElement textAlignment="Right" verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{departIntegralMeasure}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<columnGroup name="columnNum" height="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField>
-								<reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="38"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d" x="0" y="0" width="81" height="80"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnName" height="42" headerPosition="Center">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents>
-							<textField>
-								<reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="42" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents/>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{money}]]></measureExpression>
-				</measure>
-				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
-					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
-				</measure>
-				<measure name="integralMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{integral}]]></measureExpression>
-				</measure>
-				<measure name="departIntegralMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{integral}]]></measureExpression>
-				</measure>
-				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
-					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
-				</measure>
-				<crosstabCell width="79" height="25">
-					<cellContents>
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="">
-							<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="25" rowTotalGroup="rowNum">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField pattern="">
-							<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="25" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="">
-							<reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField pattern="">
-							<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000"/>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="0" rowTotalGroup="department">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="81" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-			</crosstab>
-		</band>
-	</summary>
-</jasperReport>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<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="monthReport" language="groovy" pageWidth="450" pageHeight="824" columnWidth="450" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
+	<parameter name="title" class="java.lang.String">
+		<parameterDescription><![CDATA[""]]></parameterDescription>
+	</parameter>
+	<parameter name="totalIntegral" class="java.lang.Double">
+		<parameterDescription><![CDATA[0.00]]></parameterDescription>
+	</parameter>
+	<parameter name="amountFormat" class="java.lang.String">
+		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="rowNum" class="java.lang.String">
+		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
+	</field>
+	<field name="columnNum" class="java.lang.String">
+		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
+	</field>
+	<field name="columnName" class="java.lang.String">
+		<fieldDescription><![CDATA[columnName]]></fieldDescription>
+	</field>
+	<field name="department" class="java.lang.String">
+		<fieldDescription><![CDATA[department]]></fieldDescription>
+	</field>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
+	</field>
+	<field name="money" class="java.lang.Double">
+		<fieldDescription><![CDATA[money]]></fieldDescription>
+	</field>
+	<field name="columnTitle" class="java.lang.String">
+		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
+	</field>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	</field>
+	<field name="integral" class="java.lang.Double">
+		<fieldDescription><![CDATA[integral]]></fieldDescription>
+	</field>
+	<variable name="variable1" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="34" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="450" height="34" uuid="14137749-263e-4143-a8dd-482900def002"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<summary>
+		<band height="127" splitType="Stretch">
+			<crosstab>
+				<reportElement x="0" y="0" width="450" height="103" uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c"/>
+				<crosstabParameter name="integral" class="java.lang.Double">
+					<parameterValueExpression><![CDATA[$F{integral}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="totalIntegralPara" class="java.lang.Double">
+					<parameterValueExpression><![CDATA[$P{totalIntegral}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabParameter name="amountFormatParam">
+					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
+				</crosstabParameter>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
+				<crosstabHeaderCell>
+					<cellContents>
+						<staticText>
+							<reportElement style="table_TH" x="0" y="0" width="290" height="80" backcolor="#FFFFFF" uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<text><![CDATA[部门]]></text>
+						</staticText>
+						<staticText>
+							<reportElement style="table_TH" x="290" y="0" width="79" height="80" backcolor="#FFFFFF" uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<text><![CDATA[积分]]></text>
+						</staticText>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="rowNum" width="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement x="0" y="0" width="290" height="25" forecolor="#000000" uuid="1311756a-eafc-440e-926f-b78c03af13a7"/>
+								<box>
+									<pen lineWidth="0.5"/>
+									<topPen lineWidth="0.5"/>
+									<leftPen lineWidth="0.5"/>
+									<bottomPen lineWidth="0.5"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计]]></text>
+							</staticText>
+							<textField pattern="###0.00">
+								<reportElement style="Crosstab Data Text" x="290" y="0" width="79" height="25" uuid="8d892ca4-a179-4ef5-82c9-acd818c16d70">
+									<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+								</reportElement>
+								<textElement textAlignment="Right" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+									<paragraph rightIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$P{totalIntegralPara}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<rowGroup name="department" width="369" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField textAdjust="StretchHeight">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="290" height="25" uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0"/>
+								<box>
+									<pen lineWidth="0.5"/>
+									<topPen lineWidth="0.5"/>
+									<leftPen lineWidth="0.5"/>
+									<bottomPen lineWidth="0.5"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
+								<textElement verticalAlignment="Middle">
+									<font size="12"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{department}]]></textFieldExpression>
+							</textField>
+							<textField textAdjust="StretchHeight" pattern="###0.00">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="290" y="0" width="79" height="25" uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0">
+									<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+								</reportElement>
+								<textElement textAlignment="Right" verticalAlignment="Middle">
+									<font size="12"/>
+									<paragraph rightIndent="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{departIntegralMeasure}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="columnNum" height="0" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="79" height="38" uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d"/>
+								<textElement verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement x="0" y="0" width="81" height="80" uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnName" height="42" headerPosition="Center">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents>
+							<textField>
+								<reportElement style="table_TH" x="0" y="0" width="79" height="42" backcolor="#FFFFFF" uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
+					<measureExpression><![CDATA[$F{money}]]></measureExpression>
+				</measure>
+				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
+					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
+				</measure>
+				<measure name="integralMeasure" class="java.lang.Double" calculation="Sum">
+					<measureExpression><![CDATA[$F{integral}]]></measureExpression>
+				</measure>
+				<measure name="departIntegralMeasure" class="java.lang.Double" calculation="Sum">
+					<measureExpression><![CDATA[$F{integral}]]></measureExpression>
+				</measure>
+				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
+				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
+					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
+				</measure>
+				<crosstabCell width="79" height="25">
+					<cellContents>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25" uuid="d304edd7-5900-4bdf-916c-1a90972f5d38">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="79" height="25" rowTotalGroup="rowNum">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField pattern="">
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000" uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="25" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField textAdjust="StretchHeight" pattern="">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25" uuid="8d59cefd-47be-4107-a902-d5fc6d238879">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#FFFFFF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField pattern="">
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000" uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="79" height="0" rowTotalGroup="department">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="0" height="0" rowTotalGroup="department" columnTotalGroup="columnNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="81" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell height="20" rowTotalGroup="rowNum" columnTotalGroup="columnName">
+					<cellContents/>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>