Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
===================================================================
diff -u -r30447 -r30548
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jasper
===================================================================
diff -u -r30447 -r30548
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jasper
===================================================================
diff -u -r30458 -r30548
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml
===================================================================
diff -u -r30447 -r30548
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml	(.../routineMonitoringReportOfADJ.jrxml)	(revision 30447)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml	(.../routineMonitoringReportOfADJ.jrxml)	(revision 30548)
@@ -89,21 +89,21 @@
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" x="0" y="0" width="66" height="82"/>
+							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="66" height="82"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="9" isBold="true"/>
 							</textElement>
 							<text><![CDATA[日期]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="1f6a4e60-07b1-47ce-bb44-2967fb43535b" style="table_TH" x="66" y="0" width="99" height="82"/>
+							<reportElement uuid="1f6a4e60-07b1-47ce-bb44-2967fb43535b" style="table_TH" stretchType="RelativeToBandHeight" x="66" y="0" width="99" height="82"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="9" isBold="true"/>
 							</textElement>
 							<text><![CDATA[物品名称]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" x="365" y="0" width="55" height="82"/>
+							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" stretchType="RelativeToBandHeight" x="365" y="0" width="55" height="82"/>
 							<box>
 								<rightPen lineWidth="0.0"/>
 							</box>
@@ -113,21 +113,21 @@
 							<text><![CDATA[数量]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" x="165" y="0" width="150" height="82"/>
+							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" stretchType="RelativeToBandHeight" x="165" y="0" width="150" height="82"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="9" isBold="true"/>
 							</textElement>
 							<text><![CDATA[灭菌器炉号]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" x="315" y="0" width="50" height="82"/>
+							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" stretchType="RelativeToBandHeight" x="315" y="0" width="50" height="82"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="9" isBold="true"/>
 							</textElement>
 							<text><![CDATA[炉次]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" x="420" y="0" width="100" height="82"/>
+							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" stretchType="RelativeToBandHeight" x="420" y="0" width="100" height="82"/>
 							<box>
 								<rightPen lineWidth="0.0"/>
 							</box>
@@ -317,7 +317,7 @@
 								<rightPen lineWidth="0.0"/>
 							</box>
 							<textField>
-								<reportElement uuid="49f540dd-aaf1-488d-af0f-898f630ee145" style="Crosstab Data Text" x="0" y="0" width="45" height="33"/>
+								<reportElement uuid="49f540dd-aaf1-488d-af0f-898f630ee145" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="45" height="33" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
 								<box>
 									<pen lineWidth="0.5"/>
 									<topPen lineWidth="0.5"/>
@@ -343,7 +343,7 @@
 					<crosstabColumnHeader>
 						<cellContents backcolor="#F0F8FF" mode="Opaque">
 							<textField>
-								<reportElement uuid="e1283460-48fd-4c06-afdc-7f17071f8599" style="table_TH" x="0" y="0" width="45" height="49"/>
+								<reportElement uuid="e1283460-48fd-4c06-afdc-7f17071f8599" style="table_TH" stretchType="RelativeToTallestObject" x="0" y="0" width="45" height="49"/>
 								<box>
 									<pen lineWidth="0.5"/>
 									<topPen lineWidth="0.5"/>
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jrxml
===================================================================
diff -u -r30458 -r30548
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jrxml	(.../routineMonitoringSteScopeReport.jrxml)	(revision 30458)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jrxml	(.../routineMonitoringSteScopeReport.jrxml)	(revision 30548)
@@ -89,42 +89,42 @@
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" x="0" y="0" width="66" height="132"/>
+							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="66" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font isBold="true"/>
 							</textElement>
 							<text><![CDATA[日期]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="1f6a4e60-07b1-47ce-bb44-2967fb43535b" style="table_TH" x="200" y="0" width="99" height="132"/>
+							<reportElement uuid="1f6a4e60-07b1-47ce-bb44-2967fb43535b" style="table_TH" stretchType="RelativeToBandHeight" x="200" y="0" width="99" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font isBold="true"/>
 							</textElement>
 							<text><![CDATA[物品名称]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" x="299" y="0" width="35" height="132"/>
+							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" stretchType="RelativeToBandHeight" x="299" y="0" width="35" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font isBold="true"/>
 							</textElement>
 							<text><![CDATA[数量]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" x="334" y="0" width="45" height="132"/>
+							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" stretchType="RelativeToBandHeight" x="334" y="0" width="45" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font isBold="true"/>
 							</textElement>
 							<text><![CDATA[登记人]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" x="165" y="0" width="35" height="132"/>
+							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" stretchType="RelativeToBandHeight" x="165" y="0" width="35" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font isBold="true"/>
 							</textElement>
 							<text><![CDATA[炉次]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" x="66" y="0" width="99" height="132"/>
+							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" stretchType="RelativeToBandHeight" x="66" y="0" width="99" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font isBold="true"/>
 							</textElement>
@@ -282,8 +282,8 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField>
-								<reportElement uuid="49f540dd-aaf1-488d-af0f-898f630ee145" style="Crosstab Data Text" x="0" y="0" width="26" height="17"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="49f540dd-aaf1-488d-af0f-898f630ee145" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="26" height="17" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
 								<textElement verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
@@ -301,10 +301,11 @@
 					</bucket>
 					<crosstabColumnHeader>
 						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<textField>
-								<reportElement uuid="e1283460-48fd-4c06-afdc-7f17071f8599" style="table_TH" x="0" y="0" width="26" height="115"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="e1283460-48fd-4c06-afdc-7f17071f8599" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="26" height="115"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
+									<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
 								</textElement>
 								<textFieldExpression><![CDATA[($V{option}.contains("P+"))?$V{option}.substring($V{option}.indexOf("+")+1):$V{option}]]></textFieldExpression>
 							</textField>
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
===================================================================
diff -u -r30447 -r30548
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
===================================================================
diff -u -r30447 -r30548
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml	(.../routineMonitoringReport.jrxml)	(revision 30447)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml	(.../routineMonitoringReport.jrxml)	(revision 30548)
@@ -83,28 +83,28 @@
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" x="0" y="0" width="66" height="132"/>
+							<reportElement uuid="4588ba91-9f0d-43db-959a-975d2060586c" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="66" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
 							<text><![CDATA[日期]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="1f6a4e60-07b1-47ce-bb44-2967fb43535b" style="table_TH" x="66" y="0" width="99" height="132"/>
+							<reportElement uuid="1f6a4e60-07b1-47ce-bb44-2967fb43535b" style="table_TH" stretchType="RelativeToBandHeight" x="66" y="0" width="99" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
 							<text><![CDATA[物品名称]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" x="165" y="0" width="35" height="132"/>
+							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" stretchType="RelativeToBandHeight" x="165" y="0" width="35" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
 							<text><![CDATA[数量]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" x="200" y="0" width="45" height="132"/>
+							<reportElement uuid="b8df90a0-72a1-4cf0-8803-c9b98207196f" style="table_TH" stretchType="RelativeToBandHeight" x="200" y="0" width="45" height="132"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
@@ -215,8 +215,8 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField>
-								<reportElement uuid="49f540dd-aaf1-488d-af0f-898f630ee145" style="Crosstab Data Text" x="0" y="0" width="26" height="17"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="49f540dd-aaf1-488d-af0f-898f630ee145" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="26" height="17" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
 								<textElement verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
@@ -234,10 +234,11 @@
 					</bucket>
 					<crosstabColumnHeader>
 						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<textField>
-								<reportElement uuid="e1283460-48fd-4c06-afdc-7f17071f8599" style="table_TH" x="0" y="0" width="26" height="115"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="e1283460-48fd-4c06-afdc-7f17071f8599" style="table_TH" stretchType="RelativeToTallestObject" x="0" y="0" width="26" height="115"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
+									<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
 								</textElement>
 								<textFieldExpression><![CDATA[($V{option}.contains("P+"))?$V{option}.substring($V{option}.indexOf("+")+1):$V{option}]]></textFieldExpression>
 							</textField>