Index: ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jasper
===================================================================
diff -u -r35629 -r37225
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jrxml
===================================================================
diff -u -r35629 -r37225
--- ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jrxml	(.../urgentNeedGoodsProcessingCycleReport_child_child.jrxml)	(revision 35629)
+++ ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jrxml	(.../urgentNeedGoodsProcessingCycleReport_child_child.jrxml)	(revision 37225)
@@ -1,7 +1,7 @@
 <?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="operatingRoomUseRecordReport_child_child_child" language="groovy" pageWidth="1432" pageHeight="802" columnWidth="1432" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="318375b8-53fe-47b6-a25b-2a1ddf5fb36e">
+<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="operatingRoomUseRecordReport_child_child_child" language="groovy" pageWidth="1542" pageHeight="802" columnWidth="1542" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="318375b8-53fe-47b6-a25b-2a1ddf5fb36e">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="188"/>
+	<property name="ireport.x" value="481"/>
 	<property name="ireport.y" value="0"/>
 	<field name="urgentLevel" class="java.lang.String">
 		<fieldDescription><![CDATA[urgentLevel]]></fieldDescription>
@@ -45,6 +45,9 @@
 	<field name="depart" class="java.lang.String">
 		<fieldDescription><![CDATA[depart]]></fieldDescription>
 	</field>
+	<field name="washTime" class="java.lang.String">
+		<fieldDescription><![CDATA[washTime]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -149,7 +152,7 @@
 				<textFieldExpression><![CDATA[$F{sterilizationToDeliveryDuration}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#0" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1082" y="0" width="100" height="38"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1192" y="0" width="100" height="38"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -163,7 +166,7 @@
 				<textFieldExpression><![CDATA[$F{sterilerGroup}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#0" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1182" y="0" width="80" height="38"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1292" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -177,7 +180,7 @@
 				<textFieldExpression><![CDATA[$F{sterilizationDuration}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1262" y="0" width="85" height="38"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1372" y="0" width="85" height="38"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -191,7 +194,7 @@
 				<textFieldExpression><![CDATA[$F{barcode}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1347" y="0" width="85" height="38"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1457" y="0" width="85" height="38"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -246,6 +249,20 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{serialNumber}]]></textFieldExpression>
 			</textField>
+			<textField pattern="#0" isBlankWhenNull="true">
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1082" y="0" width="110" height="38"/>
+				<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"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{washTime}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jrxml
===================================================================
diff -u -r35629 -r37225
--- ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jrxml	(.../urgentNeedGoodsProcessingCycleReport.jrxml)	(revision 35629)
+++ ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jrxml	(.../urgentNeedGoodsProcessingCycleReport.jrxml)	(revision 37225)
@@ -1,7 +1,7 @@
 <?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="monthDetail_main_1" language="groovy" pageWidth="1695" pageHeight="1000" whenNoDataType="AllSectionsNoDetail" columnWidth="1695" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
+<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="monthDetail_main_1" language="groovy" pageWidth="1805" pageHeight="1000" whenNoDataType="AllSectionsNoDetail" columnWidth="1805" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="744"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -92,7 +92,7 @@
 				<text><![CDATA[日期]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="1695" height="38"/>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="1805" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
@@ -120,28 +120,28 @@
 				<text><![CDATA[灭菌完成-发货时长（分钟）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1345" y="38" width="100" height="38" backcolor="#FFFFFF"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1455" y="38" width="100" height="38" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[灭菌方式]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1445" y="38" width="80" height="38" backcolor="#FFFFFF"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1555" y="38" width="80" height="38" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[灭菌时长（分钟）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1525" y="38" width="85" height="38" backcolor="#FFFFFF"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1635" y="38" width="85" height="38" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[器械包条码]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1610" y="38" width="85" height="38" backcolor="#FFFFFF"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1720" y="38" width="85" height="38" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -168,12 +168,19 @@
 				</textElement>
 				<text><![CDATA[申请科室]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1345" y="38" width="110" height="38" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[清洗时长（分钟）]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="38" splitType="Stretch">
 			<subreport>
-				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" stretchType="RelativeToBandHeight" mode="Opaque" x="113" y="0" width="1582" height="38" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" stretchType="RelativeToBandHeight" mode="Opaque" x="113" y="0" width="1692" height="38" isPrintWhenDetailOverflows="true"/>
 				<subreportParameter name="rootPath">
 					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -199,7 +206,7 @@
 				<text><![CDATA[汇总]]></text>
 			</staticText>
 			<textField pattern="#0" isBlankWhenNull="true">
-				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" stretchType="RelativeToBandHeight" x="113" y="0" width="1582" height="38" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" stretchType="RelativeToBandHeight" x="113" y="0" width="1692" height="38" isPrintWhenDetailOverflows="true"/>
 				<textElement verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jrxml
===================================================================
diff -u -r35629 -r37225
--- ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jrxml	(.../urgentNeedGoodsProcessingCycleReport_child.jrxml)	(revision 35629)
+++ ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jrxml	(.../urgentNeedGoodsProcessingCycleReport_child.jrxml)	(revision 37225)
@@ -1,7 +1,7 @@
 <?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="monthDetail_child_1" language="groovy" pageWidth="1582" pageHeight="842" columnWidth="1582" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="bd889010-8709-4014-9272-b71cb51c1fd3">
+<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="monthDetail_child_1" language="groovy" pageWidth="1692" pageHeight="842" columnWidth="1692" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="bd889010-8709-4014-9272-b71cb51c1fd3">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="631"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -62,7 +62,7 @@
 				<textFieldExpression><![CDATA[$F{secondShowColumnName}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement uuid="08bd648e-ac50-41ba-9017-b0977b7677b1" stretchType="RelativeToBandHeight" x="150" y="0" width="1432" height="38"/>
+				<reportElement uuid="08bd648e-ac50-41ba-9017-b0977b7677b1" stretchType="RelativeToBandHeight" x="150" y="0" width="1542" height="38"/>
 				<subreportParameter name="rootPath">
 					<subreportParameterExpression><![CDATA[$P{rootPath}]]></subreportParameterExpression>
 				</subreportParameter>
Index: ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jasper
===================================================================
diff -u -r35629 -r37225
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jasper
===================================================================
diff -u -r35629 -r37225
Binary files differ