Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
===================================================================
diff -u -r27407 -r27650
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js	(.../sterilizationRecordInfoView.js)	(revision 27407)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js	(.../sterilizationRecordInfoView.js)	(revision 27650)
@@ -57,6 +57,9 @@
 var myMask;
 Ext.onReady(function() {
 	Ext.QuickTips.init();
+	var dt = new Date();
+	var startTime = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-" + dt.getDate() + " 00:00";
+	var endTime = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-" + dt.getDate() + " 23:59";
 	var supplyRoomRecord = Ext.data.Record.create([
 			{name: 'departCode', type: 'string'},
 			{name: 'name', type: 'string'}
@@ -262,52 +265,59 @@
 					columnWidth : .25,
 					layout : 'form',
 					labelWidth : 60,
-					items : [new Ext.form.DateField({
-					     id:'startDate',
-					     name : 'startDate',
-					     fieldLabel : '开始日期',   
-					     readOnly : false,
-					  	 format:'Y-m-d',
-						 value : new Date(),
-						 anchor : '95%',
-						 listeners : {
-								specialkey : function(field, ee) {
-									if (ee.getKey() == Ext.EventObject.ENTER) {
-										var isOK = field.validate();
-										if(isOK){
-											var value = field.getValue();
-											field.setValue(value);
-											reloadReport();
-										}
+					items : [{
+						xtype : 'datefieldWithMin',
+						fieldLabel : '开始时间',
+						id : 'startDate',
+						name : 'startDate',
+						editable : false,
+						format : 'Y-m-d H:i',
+						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%',
+						value: new Date(startTime),
+						listeners : {
+							specialkey : function(field, e) {
+								if (e.getKey() == Ext.EventObject.ENTER) {
+									var isOK = field.validate();
+									if(isOK){
+										var value = field.getValue();
+										field.setValue(value);
+										reloadReport();
 									}
+									
 								}
-						 }
-					})]
+							}
+						}
+					}]
 				},{
 					columnWidth : .25,
 					layout : 'form',
 					labelWidth : 75,
-					items : [new Ext.form.DateField({
-					     id:'endDate',
-					     name : 'endDate',
-					     fieldLabel : '结束日期',   
-					     readOnly : false,
-					  	 format:'Y-m-d',
-						 value : new Date(),
-						 anchor : '95%',
-						 listeners : {
-								specialkey : function(field, ee) {
-									if (ee.getKey() == Ext.EventObject.ENTER) {
-										var isOK = field.validate();
-										if(isOK){
-											var value = field.getValue();
-											field.setValue(value);
-											reloadReport();
-										}
+					items : [{
+						xtype : 'datefieldWithMin',
+						fieldLabel : '结束时间',
+						id : 'endDate',
+						name : 'endDate',
+						editable : false,
+						format : 'Y-m-d H:i',
+						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%',
+						value: new Date(endTime),
+						listeners : {
+							specialkey : function(field, e) {
+								if (e.getKey() == Ext.EventObject.ENTER) {
+									var isOK = field.validate();
+									if(isOK){
+										var value = field.getValue();
+										field.setValue(value);
+										reloadReport();
 									}
 								}
-						 }
-					})]
+							}
+						}
+					}]
 				},{
 					columnWidth : .25,
 					layout : 'form',
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r27622 -r27650
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27622)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27650)
@@ -3047,8 +3047,8 @@
 					;*/
 			
 			sql += " where ti.sterileEndTime between '"
-					+ startDate+" 00:00:00'"
-					+ " and '" + endDate+" 23:59:59'"
+					+ startDate+":00'"
+					+ " and '" + endDate+":59'"
 					+ " and ti.status <> '"+TousseInstance.STATUS_REVIEWED+"' "
 					;
 			
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp
===================================================================
diff -u -r25318 -r27650
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp	(.../sterilizationRecordInfoView.jsp)	(revision 25318)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp	(.../sterilizationRecordInfoView.jsp)	(revision 27650)
@@ -26,7 +26,9 @@
 enableSaveBtn = true;
 </c:if>
 </script>
-
+<!-- 日期控件引入 -->
+<link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
+<script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js"></script>
 <title>灭菌情况报表</title>
 </head>
 <body>