Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27341 -r27342
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27341)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27342)
@@ -6208,8 +6208,8 @@
 			}
 		}
 		String settleDepartSearch = requestParams.get("settleDepartSearch");
-		String startDate =  DefaultValue.date(requestParams.get("startDate"),Constants.SIMPLEDATEFORMAT_YYYYMMDD);
-		String endDate = DefaultValue.date(requestParams.get("endDate"), Constants.SIMPLEDATEFORMAT_YYYYMMDD);
+		String startDate =  DefaultValue.date(requestParams.get("startDate"),Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM) + ":00";
+		String endDate = DefaultValue.date(requestParams.get("endDate"), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM) + ":59";
 		String applicant = requestParams.get("applicant");
 		String goodsName = requestParams.get("goodsName");
 		String batchNumber = requestParams.get("batchNumber");
@@ -6386,7 +6386,7 @@
 		sql += diposableSql + " union all ";
 		sql += expensiveGoods + " union all ";
 		sql += materialSql + " ) m";
-		sql += " where " + dateQueryAdapter.dateAreaSql("m.sendTime", startDate, endDate, true, true);
+		sql += " where " + dateQueryAdapter.dateAreaSql("m.sendTime", startDate, endDate);
 		
 		if (StringUtils.isNotBlank(depart)) {
 			sql += " and m.departCoding = '" + depart + "'";
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
===================================================================
diff -u -r27228 -r27342
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js	(.../invoiceQueryView.js)	(revision 27228)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js	(.../invoiceQueryView.js)	(revision 27342)
@@ -186,12 +186,12 @@
 					layout : 'form',
 					labelWidth : 95,
 					items : [{
-						xtype : 'datefield',
+						xtype : 'datefieldWithMin',
 						fieldLabel : '开始时间',
 						id : 'startDate',
 						name : 'startDate',
 						editable:true,
-						format:'Y-m-d',
+						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 : true,
 						readOnly : false,
@@ -203,14 +203,14 @@
 					layout : 'form',
 					labelWidth : 95,
 					items : [{
-						xtype : 'datefield',
+						xtype : 'datefieldWithMin',
 						fieldLabel : '结束时间',
 						id : 'endDate',
 						name : 'endDate',
 						readOnly : false,
 						editable:false,
 						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',
-						format:'Y-m-d',
+						format:'Y-m-d H:i',
 						allowBlank : true,
 						value: new Date(),
 						anchor : '95%'