Index: ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jrxml
===================================================================
diff -u -r18094 -r18109
--- ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jrxml	(.../urgentNeedGoodsProcessingCycle.jrxml)	(revision 18094)
+++ ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jrxml	(.../urgentNeedGoodsProcessingCycle.jrxml)	(revision 18109)
@@ -1,6 +1,6 @@
 <?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="urgentNeedGoodsProcessingCycle" language="groovy" pageWidth="1300" pageHeight="570" columnWidth="1300" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="1416ed9a-1f0d-40e7-8ed3-ca869238f993">
-	<property name="ireport.zoom" value="0.9090909090909091"/>
+	<property name="ireport.zoom" value="0.3855432894295319"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="title" class="java.lang.String">
@@ -318,7 +318,7 @@
 				<textFieldExpression><![CDATA[$F{deliveryTime}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="520" y="0" width="110" height="38"/>
+				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="850" y="0" width="110" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -329,10 +329,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{totalDuration}==null?"":$F{totalDuration}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{sterilizationToDeliveryDuration}==null?"":$F{sterilizationToDeliveryDuration}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="630" y="0" width="110" height="38"/>
+				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="960" y="0" width="100" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -343,10 +343,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{recyclingToWashTransitionDuration}==null?"":$F{recyclingToWashTransitionDuration}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{sterilerGroup}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="740" y="0" width="110" height="38"/>
+				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="1060" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -357,10 +357,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{packingToSterilizationDuration}==null?"":$F{packingToSterilizationDuration}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{sterilizationDuration}==null?"":$F{sterilizationDuration}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="850" y="0" width="110" height="38"/>
+				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="1140" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -371,10 +371,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sterilizationToDeliveryDuration}==null?"":$F{sterilizationToDeliveryDuration}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{barcode}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="960" y="0" width="100" height="38"/>
+				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="1220" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -385,10 +385,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sterilerGroup}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{idCardInstanceBarcode}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="1060" y="0" width="80" height="38"/>
+				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="520" y="0" width="110" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -399,10 +399,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sterilizationDuration}==null?"":$F{sterilizationDuration}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{totalDuration}==null?"":$F{totalDuration}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="1140" y="0" width="80" height="38"/>
+				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="630" y="0" width="110" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -413,10 +413,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{barcode}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{recyclingToWashTransitionDuration}==null?"":$F{recyclingToWashTransitionDuration}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="1220" y="0" width="80" height="38"/>
+				<reportElement uuid="885929c2-05f2-4ce6-836b-d19156c8004b" x="740" y="0" width="110" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -427,7 +427,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{idCardInstanceBarcode}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{packingToSterilizationDuration}==null?"":$F{packingToSterilizationDuration}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
Index: ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jasper
===================================================================
diff -u -r18094 -r18109
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18108 -r18109
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18108)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18109)
@@ -15339,8 +15339,8 @@
 					String idCardInstanceBarcode = StringTools.defaultString(result.getString("idCardInstanceBarcode"));
 					String ownGroup = StringTools.defaultString(result.getString("ownGroup"));
 
-					String recyclingTime = ForgonDateUtils.safelyFormatDate(result.getTimestamp("recyclingTime"), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM,
-							ForgonDateUtils.safelyFormatDate(result.getTimestamp("washTransitionTime"), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
+					String recyclingTime = ForgonDateUtils.safelyFormatDate(result.getTimestamp("recyclingTime"), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "");
+					String tousseTransitionTime = ForgonDateUtils.safelyFormatDate(result.getTimestamp("tousseTransitionTime"), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "");
 					String invoiceSendTime = ForgonDateUtils.safelyFormatDate(result.getTimestamp("invoiceSendTime"), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "");
 					
 					Date tousseTransitionDateTime = result.getTimestamp("tousseTransitionTime");
@@ -15352,6 +15352,7 @@
 					Date invoiceSendDateTime = result.getTimestamp("invoiceSendTime");
 					if (tousseTransitionDateTime != null) {  //如果有预回收的时间，则取之
 						recyclingDateTime = tousseTransitionDateTime;
+						recyclingTime = tousseTransitionTime;
 					}
 					
 					UrgentNeedGoodsProcessingCycle bean = new UrgentNeedGoodsProcessingCycle();
@@ -15363,7 +15364,7 @@
 					//计算回收到清洗交接时长
 					if (recyclingDateTime != null && washTransitionDateTime != null) {
 						Long recyclingToWashTransitionDuration = (washTransitionDateTime.getTime() - recyclingDateTime.getTime())/1000/60;
-						bean.setRecyclingToWashTransitionDuration(Math.abs(recyclingToWashTransitionDuration.intValue()));
+						bean.setRecyclingToWashTransitionDuration(recyclingToWashTransitionDuration.intValue());
 					}
 					//计算装配到灭菌时长
 					if (operationDateTime != null && startDateTime != null) {