Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml
===================================================================
diff -u -r30112 -r30149
--- ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml	(.../monthReportBranche.jrxml)	(revision 30112)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml	(.../monthReportBranche.jrxml)	(revision 30149)
@@ -86,7 +86,7 @@
 					<crosstabHeaderCell>
 						<cellContents>
 							<staticText>
-								<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="0" width="100" height="80" backcolor="#FFFFFF"/>
+								<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>
@@ -96,7 +96,7 @@
 								<text><![CDATA[院区]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="100" y="0" width="290" height="80" backcolor="#FFFFFF"/>
+								<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>
@@ -122,7 +122,7 @@
 									<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 								<staticText>
-									<reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" mode="Opaque" x="0" y="0" width="390" height="25" forecolor="#000000" backcolor="#9BC2E6"/>
+									<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"/>
@@ -138,14 +138,14 @@
 							</cellContents>
 						</crosstabTotalRowHeader>
 					</rowGroup>
-					<rowGroup name="hospitalDistrict" width="100" totalPosition="End">
+					<rowGroup name="hospitalDistrict" width="200" totalPosition="End">
 						<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" x="0" y="0" width="100" height="25"/>
+									<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"/>
@@ -174,16 +174,18 @@
 								<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" mode="Opaque" x="0" y="0" width="290" height="25"/>
+								<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"/>
+									<textElement textAlignment="Left" verticalAlignment="Middle">
+										<font isPdfEmbedded="true"/>
+									</textElement>
 									<textFieldExpression><![CDATA[($V{department}.contains("合计"))?"  合计":"  "+$V{department}]]></textFieldExpression>
 								</textField>
 							</cellContents>
@@ -297,7 +299,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField isStretchWithOverflow="true" pattern="">
-								<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="79" height="25" forecolor="#000000" backcolor="#9BC2E6"/>
+								<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="79" height="25" forecolor="#000000" backcolor="#9BC2E6"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -333,7 +335,7 @@
 								<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"/>
+								<reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25" isRemoveLineWhenBlank="true"/>
 								<textElement textAlignment="Right" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -349,7 +351,7 @@
 							</box>
 							<elementGroup>
 								<textField isStretchWithOverflow="true" pattern="">
-									<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="81" height="25" forecolor="#000000" backcolor="#9BC2E6"/>
+									<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="81" height="25" forecolor="#000000" backcolor="#9BC2E6"/>
 									<box>
 										<pen lineWidth="1.0"/>
 										<topPen lineWidth="1.0"/>
@@ -393,7 +395,7 @@
 					<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
 						<cellContents/>
 					</crosstabCell>
-					<crosstabCell height="0" rowTotalGroup="hospitalDistrict">
+					<crosstabCell width="79" height="0" rowTotalGroup="hospitalDistrict">
 						<cellContents/>
 					</crosstabCell>
 					<crosstabCell height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnNum">