Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jasper
===================================================================
diff -u -r15488 -r16301
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r16272 -r16301
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16272)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16301)
@@ -11105,6 +11105,13 @@
 	public List<ForeignTousseAfterUseDeliveryVO> getforeignTousseAfterUseDeliveryVOList(
 			String startTime, String endTime, String departCoding) {
 		
+		if(StringUtils.isNotBlank(startTime) && startTime.trim().length() == 10){
+			startTime = startTime + " 00:00:00";
+		}
+		if(StringUtils.isNotBlank(endTime) && endTime.trim().length() == 10){
+			endTime = endTime + " 23:59:59";
+		}
+		
 		String betweenSql = "between "
 				+ dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI")
 				+ " and " + dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI") + " ";
@@ -11138,9 +11145,6 @@
 				+ "order by rr.recyclingTime desc"
 				;
 		
-		
-		
-		
 		ResultSet result = objectDao.executeSql(sql);
 		
 		try {
@@ -11150,7 +11154,7 @@
 				ForeignTousseAfterUseDeliveryVO vo = voMap.get(invoicePlanID);
 				String personInCharge = StringTools.defaultString(result.getString("personInCharge"));
 				String washAndDisinfectRecordId = StringTools.defaultString(result.getString("washAndDisinfectRecordId"));
-				personInCharge = (washAndDisinfectRecordId.equals("") ? "" : personInCharge);  //怕用户录入了清洗记录，然后又把那个清洗篮筐删除了，但是只删除关系表,而我这里又是做外连接
+				personInCharge = (washAndDisinfectRecordId.equals("") ? "" : personInCharge);  //怕用户录入了清洗记录，然后又把那个清洗篮筐删除了，但是只删除关系表,而我这里又是做外连接，所以这种情况下还是把清洗者显示为空
 				
 				if (vo == null) {
 					vo = new ForeignTousseAfterUseDeliveryVO();
@@ -11159,7 +11163,7 @@
 					String supplierName = StringTools.defaultString(result.getString("supplierName"));
 					
 					if (recyclingTime.length() > 16) {
-						recyclingTime = recyclingTime.substring(0, 16);
+						recyclingTime = recyclingTime.substring(0, 10);
 					}
 					
 					vo.setTwoRecovery(recyclingTime);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java
===================================================================
diff -u -r15697 -r16301
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java	(.../ForeignTousseAfterUseDeliveryVO.java)	(revision 15697)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java	(.../ForeignTousseAfterUseDeliveryVO.java)	(revision 16301)
@@ -28,7 +28,7 @@
 	private String supplier;
 	
 	/**
-	 * 清洗消毒员
+	 * 清洗者
 	 */
 	private String washAndDisinfectUser;
 
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml
===================================================================
diff -u -r15488 -r16301
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml	(.../foreignTousseAfterUseDelivery.jrxml)	(revision 15488)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml	(.../foreignTousseAfterUseDelivery.jrxml)	(revision 16301)
@@ -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="foreignTousseAfterUseDelivery" language="groovy" pageWidth="860" pageHeight="842" columnWidth="720" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="79a53459-3942-426a-8d05-1ee28245e9d4">
-	<property name="ireport.zoom" value="1.2100000000000006"/>
+	<property name="ireport.zoom" value="1.2100000000000009"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="title" class="java.lang.String"/>
@@ -16,7 +16,7 @@
 			<textField>
 				<reportElement uuid="29fac231-b8df-489f-b7b5-0f5abf56b98a" x="0" y="0" width="833" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font fontName="Arial" size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
@@ -67,7 +67,7 @@
 				<text><![CDATA[器械公司]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a362de69-42ca-43c8-88e4-5d9eb43563ad" x="399" y="0" width="134" height="33"/>
+				<reportElement uuid="a362de69-42ca-43c8-88e4-5d9eb43563ad" x="499" y="0" width="134" height="33"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -81,7 +81,7 @@
 				<text><![CDATA[清洗者签名]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7279fb2e-0a2d-4260-a7a3-23bb49c4c547" x="533" y="0" width="100" height="33"/>
+				<reportElement uuid="dad74ff3-3186-4a94-bb85-b2d5fff4dcb3" x="633" y="0" width="100" height="33"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -92,10 +92,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械齐全]]></text>
+				<text><![CDATA[CSSD交接者]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="dad74ff3-3186-4a94-bb85-b2d5fff4dcb3" x="633" y="0" width="100" height="33"/>
+				<reportElement uuid="d2e6960f-207f-4589-8d67-c6a2113b7294" x="733" y="0" width="100" height="33"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -106,10 +106,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[CSSD交接者]]></text>
+				<text><![CDATA[器械公司交接者]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d2e6960f-207f-4589-8d67-c6a2113b7294" x="733" y="0" width="100" height="33"/>
+				<reportElement uuid="7279fb2e-0a2d-4260-a7a3-23bb49c4c547" x="399" y="0" width="100" height="33"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -120,7 +120,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械公司交接者]]></text>
+				<text><![CDATA[器械齐全]]></text>
 			</staticText>
 		</band>
 	</columnHeader>
@@ -169,7 +169,7 @@
 				<textFieldExpression><![CDATA[$F{supplier}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4c0d0735-ae69-432b-992a-149b368174c9" x="399" y="0" width="134" height="66"/>
+				<reportElement uuid="4c0d0735-ae69-432b-992a-149b368174c9" x="499" y="0" width="134" height="66"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -197,7 +197,7 @@
 				<text><![CDATA[]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="34f41a71-2429-4043-8be7-de787b71f047" x="533" y="0" width="100" height="66"/>
+				<reportElement uuid="34f41a71-2429-4043-8be7-de787b71f047" x="399" y="0" width="100" height="66"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js
===================================================================
diff -u -r15481 -r16301
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js	(.../foreignTousseAfterUseDelivery.js)	(revision 15481)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js	(.../foreignTousseAfterUseDelivery.js)	(revision 16301)
@@ -10,6 +10,11 @@
 		}
 		var startTime= $Id('startTime').value;
 		var endTime = $Id('endTime').value;
+		
+		if (startTime > endTime) {
+			showResult('开始时间不能大于结束时间！');
+			return false;
+		}
 		var departCoding = Ext.getCmp('querySupplyRoom').getValue();
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
@@ -75,7 +80,7 @@
 							id : 'startTime',
 							name : 'startTime',
 							editable : false,
-							format : 'Y-m-d H:i',
+							format : 'Y-m-d',
 							altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 							allowBlank : false,
 							readOnly : true,
@@ -94,7 +99,7 @@
 						id : 'endTime',
 						name : 'endTime',
 						editable : false,
-						format : 'Y-m-d H:i',
+						format : 'Y-m-d',
 						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 						allowBlank : false,
 						anchor : '95%',
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r16270 -r16301
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 16270)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 16301)
@@ -1257,11 +1257,11 @@
 		}else if(reportName.equals("borrowingReport")){
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
-			map.put("title", "借还物品统计报表("+startDay+"~"+endDay+")");
+			map.put("title", "借还物品统计报表("+startDay+" ~ "+endDay+")");
 		}else if ("godownEntryStatistic".equals(reportName)) {
 			String startDay = StrutsParamUtils.getPraramValue("timeStart", "");
 			String endDay = StrutsParamUtils.getPraramValue("timeEnd", "");
-			map.put("title", "入库物品统计报表("+startDay+"~"+endDay+")");
+			map.put("title", "入库物品统计报表("+startDay+" ~ "+endDay+")");
 			String suplierName = StrutsParamUtils.getPraramValue("suplierName", "");
 			if(StringUtils.isNotBlank(suplierName)){
 				suplierName = "供应商:" + suplierName;
@@ -1270,15 +1270,15 @@
 		}else if ("godownEntryDetailStatistic".equals(reportName)) {
 			String startDay = StrutsParamUtils.getPraramValue("timeStart", "");
 			String endDay = StrutsParamUtils.getPraramValue("timeEnd", "");
-			map.put("title", "入库物品明细统计报表("+startDay+"~"+endDay+")");
+			map.put("title", "入库物品明细统计报表("+startDay+" ~ "+endDay+")");
 		}else if(reportName.equals("foreignTousseApplicationReport")){
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
-			map.put("title", "外来器械申请单统计报表("+startDay+"~"+endDay+")");
+			map.put("title", "外来器械申请单统计报表("+startDay+" ~ "+endDay+")");
 		}else if(reportName.equals("useRecordItemView")){
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
-			map.put("title", "使用记录录入明细统计报表("+startDay+"~"+endDay+")");
+			map.put("title", "使用记录录入明细统计报表("+startDay+" ~ "+endDay+")");
 		}else if("godownEntrySummary".equals(reportName)){
 			String startDay = StrutsParamUtils.getPraramValue("timeStart", "");
 			String endDay = StrutsParamUtils.getPraramValue("timeEnd", "");
@@ -1314,17 +1314,17 @@
 		} else if (reportName.equals("foreignTousseSterilizationMonitorAndDelivery")) {
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
-			String title = "外来器械包的植入物和植入型器械灭菌监测及发放报表  (" + startDay + "~" + endDay + ")";
+			String title = "外来器械包的植入物和植入型器械灭菌监测及发放报表  (" + startDay + " ~ " + endDay + ")";
 			map.put("title", title);
 		} else if (reportName.equals("foreignTousseAfterUseDelivery")) {
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
-			String title = "外来器械使用后交接报表 (" + startDay + "~" + endDay + ")";
+			String title = "外来器械使用后交接报表 (" + startDay + " ~ " + endDay + ")";
 			map.put("title", title);
 		} else if (reportName.equals("summaryUseRecordForGoods")) {
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
-			String title = "使用记录物品分类汇总表 (" + startDay + "~" + endDay + ")";
+			String title = "使用记录物品分类汇总表 (" + startDay + " ~ " + endDay + ")";
 			map.put("title", title);
 		}else if (reportName.equals("QualityMonitoringInspectMonthReport")) {
 			String year = StrutsParamUtils.getPraramValue("queryYear", null);