Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jasper
===================================================================
diff -u -r35552 -r35618
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jasper
===================================================================
diff -u -r35552 -r35618
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jrxml
===================================================================
diff -u -r35552 -r35618
--- ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jrxml	(.../sterilizingStoveEmptyFurnaceUseCount_child.jrxml)	(revision 35552)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jrxml	(.../sterilizingStoveEmptyFurnaceUseCount_child.jrxml)	(revision 35618)
@@ -1,5 +1,4 @@
 <?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="sterilizingStoveUseCount_child" language="groovy" pageWidth="805" pageHeight="50" columnWidth="805" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="9653d4f6-fc92-4f00-983c-4ae4b0119999">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
@@ -38,8 +37,8 @@
 	</variable>
 	<detail>
 		<band height="50" splitType="Stretch">
-			<textField textAdjust="ScaleFont">
-				<reportElement mode="Opaque" x="0" y="0" width="172" height="50" uuid="b3ce7486-440d-47e0-847c-7eb842ab7e0e"/>
+			<textField>
+				<reportElement uuid="b3ce7486-440d-47e0-847c-7eb842ab7e0e" mode="Opaque" x="0" y="0" width="172" height="50"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="1.0"/>
@@ -52,8 +51,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizerName}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont">
-				<reportElement mode="Opaque" x="172" y="0" width="125" height="50" uuid="ee7f7148-e8ab-4a37-aad3-bb65bc72753d"/>
+			<textField>
+				<reportElement uuid="ee7f7148-e8ab-4a37-aad3-bb65bc72753d" mode="Opaque" x="172" y="0" width="125" height="50"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="1.0"/>
@@ -66,8 +65,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{successEmptyFurnaceCount}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont">
-				<reportElement mode="Opaque" x="547" y="0" width="125" height="50" uuid="ee7f7148-e8ab-4a37-aad3-bb65bc72753d"/>
+			<textField>
+				<reportElement uuid="ee7f7148-e8ab-4a37-aad3-bb65bc72753d" mode="Opaque" x="547" y="0" width="125" height="50"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="1.0"/>
@@ -80,8 +79,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{failureCount}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont">
-				<reportElement mode="Opaque" x="672" y="0" width="133" height="50" backcolor="#F0F8FF" uuid="256439c9-ea24-45c9-afd0-83fc36dcadf9"/>
+			<textField>
+				<reportElement uuid="256439c9-ea24-45c9-afd0-83fc36dcadf9" mode="Opaque" x="672" y="0" width="133" height="50" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="1.0"/>
@@ -94,8 +93,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{failureCount}+$F{successCount}+$F{failureEmptyFurnaceCount}+$F{successEmptyFurnaceCount}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont">
-				<reportElement mode="Opaque" x="297" y="0" width="125" height="50" uuid="87b76e82-d804-46e0-8478-9e546cafc4f3"/>
+			<textField>
+				<reportElement uuid="87b76e82-d804-46e0-8478-9e546cafc4f3" mode="Opaque" x="297" y="0" width="125" height="50"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="1.0"/>
@@ -108,8 +107,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{successCount}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont">
-				<reportElement mode="Opaque" x="422" y="0" width="125" height="50" uuid="c72a5334-cf2c-4dd5-b1bc-85f222a9114e"/>
+			<textField>
+				<reportElement uuid="c72a5334-cf2c-4dd5-b1bc-85f222a9114e" mode="Opaque" x="422" y="0" width="125" height="50"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="1.0"/>
Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jrxml
===================================================================
diff -u -r35552 -r35618
--- ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jrxml	(.../sterilizingStoveEmptyFurnaceUseCount.jrxml)	(revision 35552)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jrxml	(.../sterilizingStoveEmptyFurnaceUseCount.jrxml)	(revision 35618)
@@ -1,8 +1,7 @@
 <?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="sterilizingStoveUseCount" language="groovy" pageWidth="938" pageHeight="842" columnWidth="938" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="aa979892-1856-4053-a698-5118f961f8a4">
 	<property name="ireport.zoom" value="1.210000000000001"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="287"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -56,14 +55,14 @@
 	<title>
 		<band height="91" splitType="Stretch">
 			<textField>
-				<reportElement mode="Opaque" x="0" y="20" width="938" height="35" uuid="ca358ad0-a064-4fbc-a5b2-ccd593e955f7"/>
+				<reportElement uuid="ca358ad0-a064-4fbc-a5b2-ccd593e955f7" mode="Opaque" x="0" y="20" width="938" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement mode="Opaque" x="0" y="55" width="938" height="35" uuid="ca358ad0-a064-4fbc-a5b2-ccd593e955f7"/>
+				<reportElement uuid="ca358ad0-a064-4fbc-a5b2-ccd593e955f7" mode="Opaque" x="0" y="55" width="938" height="35"/>
 				<box>
 					<pen lineWidth="0.0"/>
 					<topPen lineWidth="0.0"/>
@@ -81,7 +80,7 @@
 	<columnHeader>
 		<band height="76" splitType="Stretch">
 			<staticText>
-				<reportElement style="table_TH" mode="Opaque" x="133" y="0" width="172" height="76" uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249">
+				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="133" y="0" width="172" height="76">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box>
@@ -97,7 +96,7 @@
 				<text><![CDATA[灭菌炉]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" mode="Opaque" x="0" y="0" width="133" height="76" uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249">
+				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="0" y="0" width="133" height="76">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box>
@@ -113,7 +112,7 @@
 				<text><![CDATA[科室名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" mode="Opaque" x="805" y="0" width="133" height="76" uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249">
+				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="805" y="0" width="133" height="76">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box>
@@ -129,7 +128,7 @@
 				<text><![CDATA[总次数]]></text>
 			</staticText>
 			<textField>
-				<reportElement mode="Opaque" x="555" y="0" width="250" height="38" backcolor="#F0F8FF" uuid="3250dd3b-9a6d-45bf-8c16-a2cddfd13ff2">
+				<reportElement uuid="3250dd3b-9a6d-45bf-8c16-a2cddfd13ff2" mode="Opaque" x="555" y="0" width="250" height="38" backcolor="#F0F8FF">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<box>
@@ -145,7 +144,7 @@
 				<textFieldExpression><![CDATA[$P{unqualifiedColumnName}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement mode="Opaque" x="305" y="0" width="250" height="38" backcolor="#F0F8FF" uuid="3250dd3b-9a6d-45bf-8c16-a2cddfd13ff2">
+				<reportElement uuid="3250dd3b-9a6d-45bf-8c16-a2cddfd13ff2" mode="Opaque" x="305" y="0" width="250" height="38" backcolor="#F0F8FF">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<box>
@@ -161,7 +160,7 @@
 				<textFieldExpression><![CDATA[$P{qualifiedColumnName}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement style="table_TH" mode="Opaque" x="305" y="38" width="125" height="38" uuid="69e61f09-ba0e-4396-806e-0cd0b0603a53">
+				<reportElement uuid="69e61f09-ba0e-4396-806e-0cd0b0603a53" style="table_TH" mode="Opaque" x="305" y="38" width="125" height="38">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<box>
@@ -177,7 +176,7 @@
 				<text><![CDATA[空炉]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" mode="Opaque" x="430" y="38" width="125" height="38" uuid="11c86bad-dac6-4ba7-bd0c-1d9985f50705">
+				<reportElement uuid="11c86bad-dac6-4ba7-bd0c-1d9985f50705" style="table_TH" mode="Opaque" x="430" y="38" width="125" height="38">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<box>
@@ -193,7 +192,7 @@
 				<text><![CDATA[非空炉]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" mode="Opaque" x="555" y="38" width="125" height="38" uuid="5c4808e8-9b1a-4a96-aa00-0e337eb6205d">
+				<reportElement uuid="5c4808e8-9b1a-4a96-aa00-0e337eb6205d" style="table_TH" mode="Opaque" x="555" y="38" width="125" height="38">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<box>
@@ -209,7 +208,7 @@
 				<text><![CDATA[空炉]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" mode="Opaque" x="680" y="38" width="125" height="38" uuid="2ae8aa57-d1ba-4f89-a17e-985d7e8448e0">
+				<reportElement uuid="2ae8aa57-d1ba-4f89-a17e-985d7e8448e0" style="table_TH" mode="Opaque" x="680" y="38" width="125" height="38">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<box>
@@ -229,7 +228,7 @@
 	<detail>
 		<band height="50" splitType="Stretch">
 			<textField>
-				<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="133" height="50" uuid="1429a7de-63e7-4a3a-948d-b7e3d76ea1ab"/>
+				<reportElement uuid="1429a7de-63e7-4a3a-948d-b7e3d76ea1ab" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="133" height="50"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -243,7 +242,7 @@
 				<textFieldExpression><![CDATA[$F{departName}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="133" y="0" width="805" height="50" uuid="dad27028-c60b-47eb-81eb-299d37714a81">
+				<reportElement uuid="dad27028-c60b-47eb-81eb-299d37714a81" stretchType="RelativeToTallestObject" mode="Opaque" x="133" y="0" width="805" height="50">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{list})]]></dataSourceExpression>
@@ -258,10 +257,10 @@
 	<summary>
 		<band height="120">
 			<textField>
-				<reportElement positionType="FixRelativeToBottom" mode="Opaque" x="305" y="0" width="125" height="50" backcolor="#F0F8FF" uuid="aa5ef2ba-82d1-4673-a432-08396715c06f"/>
+				<reportElement uuid="aa5ef2ba-82d1-4673-a432-08396715c06f" positionType="FixRelativeToBottom" mode="Opaque" x="305" y="0" width="125" height="50" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
-					<topPen lineWidth="0.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
@@ -272,10 +271,10 @@
 				<textFieldExpression><![CDATA[$V{successEmptyFurnaceCountAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement mode="Opaque" x="430" y="0" width="125" height="50" backcolor="#F0F8FF" uuid="963434b1-2cc0-4988-ad4d-196f45800734"/>
+				<reportElement uuid="963434b1-2cc0-4988-ad4d-196f45800734" mode="Opaque" x="430" y="0" width="125" height="50" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
-					<topPen lineWidth="0.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
@@ -286,7 +285,7 @@
 				<textFieldExpression><![CDATA[$V{successCountAmount}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement mode="Opaque" x="0" y="0" width="133" height="50" backcolor="#F0F8FF" uuid="1285b261-e098-4be7-bff0-a9fa5cf3ba73"/>
+				<reportElement uuid="1285b261-e098-4be7-bff0-a9fa5cf3ba73" mode="Opaque" x="0" y="0" width="133" height="50" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -300,23 +299,24 @@
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<staticText>
-				<reportElement positionType="FixRelativeToBottom" mode="Opaque" x="133" y="0" width="172" height="50" backcolor="#F0F8FF" uuid="89b44be3-c3a4-4c30-a8b4-3983f2fecafa">
+				<reportElement uuid="89b44be3-c3a4-4c30-a8b4-3983f2fecafa" positionType="FixRelativeToBottom" mode="Opaque" x="133" y="0" width="172" height="50" backcolor="#F0F8FF">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box>
 					<pen lineWidth="1.0"/>
-					<topPen lineWidth="0.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
+				<textElement/>
 				<text><![CDATA[]]></text>
 			</staticText>
 			<textField>
-				<reportElement mode="Opaque" x="805" y="0" width="133" height="50" backcolor="#F0F8FF" uuid="123637cc-d97c-4f07-8b42-a141c2685d1b"/>
+				<reportElement uuid="123637cc-d97c-4f07-8b42-a141c2685d1b" mode="Opaque" x="805" y="0" width="133" height="50" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
-					<topPen lineWidth="0.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
@@ -327,24 +327,24 @@
 				<textFieldExpression><![CDATA[$V{successCountAmount}+$V{failureCountAmount}+$V{successEmptyFurnaceCountAmount}+$V{failureEmptyFurnaceCountAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement mode="Opaque" x="555" y="0" width="125" height="50" backcolor="#F0F8FF" uuid="1df50a43-0651-4c87-b652-b0aa2f010a13"/>
+				<reportElement uuid="1df50a43-0651-4c87-b652-b0aa2f010a13" mode="Opaque" x="555" y="0" width="125" height="50" backcolor="#F0F8FF"/>
 				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="0.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
+					<pen lineWidth="1.25"/>
+					<topPen lineWidth="1.25"/>
+					<leftPen lineWidth="1.25"/>
+					<bottomPen lineWidth="1.25"/>
+					<rightPen lineWidth="1.25"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{failureEmptyFurnaceCountAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement mode="Opaque" x="680" y="0" width="125" height="50" backcolor="#F0F8FF" uuid="073f49a4-f1f7-4ebc-8885-90982023f87d"/>
+				<reportElement uuid="073f49a4-f1f7-4ebc-8885-90982023f87d" mode="Opaque" x="680" y="0" width="125" height="50" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
-					<topPen lineWidth="0.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>