Index: ssts-web/src/main/webapp/jasperRtp/unUseTousseInstanceViewSub.jrxml
===================================================================
diff -u -r41209 -r41238
--- ssts-web/src/main/webapp/jasperRtp/unUseTousseInstanceViewSub.jrxml	(.../unUseTousseInstanceViewSub.jrxml)	(revision 41209)
+++ ssts-web/src/main/webapp/jasperRtp/unUseTousseInstanceViewSub.jrxml	(.../unUseTousseInstanceViewSub.jrxml)	(revision 41238)
@@ -1,5 +1,5 @@
 <?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="useRecordTotalViewSub" language="groovy" pageWidth="414" pageHeight="30" columnWidth="414" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b7acc574-2bc1-4427-9b79-b4ff4e5c1eba">
+<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="useRecordTotalViewSub" language="groovy" pageWidth="552" pageHeight="30" columnWidth="552" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b7acc574-2bc1-4427-9b79-b4ff4e5c1eba">
 	<property name="ireport.zoom" value="1.366026910730142"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -41,8 +41,8 @@
 	</background>
 	<detail>
 		<band height="30" splitType="Stretch">
-			<textField>
-				<reportElement uuid="e437bbc3-381d-43f7-9ff2-328908bc91b2" style="table_TD" mode="Opaque" x="0" y="0" width="138" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="e437bbc3-381d-43f7-9ff2-328908bc91b2" style="table_TD" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="276" height="30" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -56,7 +56,7 @@
 				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="8201e014-5788-435a-8acc-4787d2160888" style="table_TD" mode="Opaque" x="138" y="0" width="138" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="8201e014-5788-435a-8acc-4787d2160888" style="table_TD" stretchType="RelativeToTallestObject" mode="Opaque" x="276" y="0" width="138" height="30" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -70,7 +70,7 @@
 				<textFieldExpression><![CDATA[$F{barcode}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="cf437833-580d-4820-8101-cc8ced3a5e7c" style="table_TD" mode="Opaque" x="276" y="0" width="138" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="cf437833-580d-4820-8101-cc8ced3a5e7c" style="table_TD" stretchType="RelativeToTallestObject" mode="Opaque" x="414" y="0" width="138" height="30" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
Index: ssts-web/src/main/webapp/jasperRtp/unUseTousseInstanceView.jasper
===================================================================
diff -u -r41209 -r41238
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/unUseTousseInstanceViewSub.jasper
===================================================================
diff -u -r41209 -r41238
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/unUseTousseInstanceView.jrxml
===================================================================
diff -u -r41209 -r41238
--- ssts-web/src/main/webapp/jasperRtp/unUseTousseInstanceView.jrxml	(.../unUseTousseInstanceView.jrxml)	(revision 41209)
+++ ssts-web/src/main/webapp/jasperRtp/unUseTousseInstanceView.jrxml	(.../unUseTousseInstanceView.jrxml)	(revision 41238)
@@ -56,7 +56,7 @@
 	<columnHeader>
 		<band height="30">
 			<staticText>
-				<reportElement uuid="6dffc1e3-8009-4ed3-b425-62ec9b2e6f06" style="table_TH" mode="Opaque" x="0" y="0" width="141" height="30"/>
+				<reportElement uuid="6dffc1e3-8009-4ed3-b425-62ec9b2e6f06" style="table_TH" mode="Opaque" x="0" y="0" width="141" height="30" isPrintWhenDetailOverflows="true"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -69,7 +69,7 @@
 				<text><![CDATA[申请科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="defa16f3-c411-4e79-819d-35baafd45e2d" style="table_TD" mode="Opaque" x="279" y="0" width="138" height="30" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="defa16f3-c411-4e79-819d-35baafd45e2d" style="table_TD" mode="Opaque" x="141" y="0" width="276" height="30" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -110,20 +110,6 @@
 				</textElement>
 				<text><![CDATA[回收时间]]></text>
 			</staticText>
-			<staticText>
-				<reportElement uuid="defa16f3-c411-4e79-819d-35baafd45e2d" style="table_TD" mode="Opaque" x="141" y="0" width="138" height="30" forecolor="#000000" backcolor="#F0F8FF"/>
-				<box>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<text><![CDATA[器械包数量统计]]></text>
-			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -143,30 +129,16 @@
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
 			<subreport isUsingCache="false">
-				<reportElement uuid="3f81cb4f-16e7-4427-b9c7-26bfb75f7d29" mode="Transparent" x="279" y="0" width="414" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="3f81cb4f-16e7-4427-b9c7-26bfb75f7d29" mode="Transparent" x="141" y="0" width="552" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{list})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "unUseTousseInstanceViewSub.jasper"]]></subreportExpression>
 			</subreport>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="2ce4fada-86fe-4ecf-9d24-378ab6e9e9df" stretchType="RelativeToBandHeight" mode="Opaque" x="141" y="0" width="138" height="30" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<box>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{summary}]]></textFieldExpression>
-			</textField>
 		</band>
 	</detail>
 	<summary>
 		<band height="30">
 			<staticText>
-				<reportElement uuid="3a6214dd-0bf0-47e7-9594-3b51aecbd494" mode="Opaque" x="0" y="0" width="140" height="30" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="3a6214dd-0bf0-47e7-9594-3b51aecbd494" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="140" height="30" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -180,8 +152,8 @@
 				</textElement>
 				<text><![CDATA[合计]]></text>
 			</staticText>
-			<textField>
-				<reportElement uuid="4445367b-e9f4-4895-9e8b-683b76010734" mode="Opaque" x="141" y="0" width="552" height="30" forecolor="#000000" backcolor="#F0F8FF"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="4445367b-e9f4-4895-9e8b-683b76010734" stretchType="RelativeToBandHeight" mode="Opaque" x="141" y="0" width="552" height="30" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/model/UnusedTousseInstanceInfo.java
===================================================================
diff -u -r41193 -r41238
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/model/UnusedTousseInstanceInfo.java	(.../UnusedTousseInstanceInfo.java)	(revision 41193)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/model/UnusedTousseInstanceInfo.java	(.../UnusedTousseInstanceInfo.java)	(revision 41238)
@@ -1,5 +1,8 @@
 package com.forgon.disinfectsystem.jasperreports.unusetousseinstance.model;
 
+import com.forgon.tools.util.ForgonDateUtils;
+
+import java.util.Date;
 import java.util.Objects;
 
 public class UnusedTousseInstanceInfo {
@@ -37,7 +40,8 @@
     }
 
     public void setRecyclingTime(String recyclingTime) {
-        this.recyclingTime = recyclingTime;
+        Date date = ForgonDateUtils.safelyParseDate(recyclingTime, ForgonDateUtils.DATE_FORMAT_YYYYMMDDHHMMSS);
+        this.recyclingTime = ForgonDateUtils.safelyFormatDate(date, ForgonDateUtils.DATE_FORMAT_YYYYMMDDHHMMSS, "");
     }
 
     @Override