Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
===================================================================
diff -u -r33895 -r34942
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java	(.../SystemWarningAction.java)	(revision 33895)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java	(.../SystemWarningAction.java)	(revision 34942)
@@ -180,17 +180,35 @@
 			Date now = new Date();
 			switch (warningType) {
 				case SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE:
-					sqlBuilder.append(" AND po.validUntil < " + dateQueryAdapter.dateAdapter(now));
-					setQueryTime(sqlBuilder, "po.validUntil", startTime, endTime);
+					if(StringUtils.isBlank(startTime)
+							|| StringUtils.isBlank(endTime)){
+						sqlBuilder.append(" AND po.validUntil < " + dateQueryAdapter.dateAdapter(now));
+					}else{
+						setQueryTime(sqlBuilder, "po.validUntil", startTime, endTime);
+					}
 					break;
 				case SystemWarningItemVO.WARNING_TYPE_TOUSSE:
-					sqlBuilder.append(" AND po.warningUntil < " + dateQueryAdapter.dateAdapter(now));
-					sqlBuilder.append(" AND po.validUntil > " + dateQueryAdapter.dateAdapter(now));
-					setQueryTime(sqlBuilder, "po.warningUntil", startTime, endTime);
+					if(StringUtils.isBlank(startTime)
+							|| StringUtils.isBlank(endTime)){
+						sqlBuilder.append(" AND po.warningUntil < " + dateQueryAdapter.dateAdapter(now));
+						sqlBuilder.append(" AND po.validUntil > " + dateQueryAdapter.dateAdapter(now));
+					}else{
+						setQueryTime(sqlBuilder, "po.warningUntil", startTime, endTime);
+					}
 					break;
 				default:  //默认显示已过期和即将过期的所有器械包
-					sqlBuilder.append(" AND po.warningUntil < " + dateQueryAdapter.dateAdapter(now));
-					setQueryTime(sqlBuilder, "po.warningUntil", startTime, endTime);
+					if(StringUtils.isBlank(startTime)
+							|| StringUtils.isBlank(endTime)){
+						sqlBuilder.append(" AND po.warningUntil < " + dateQueryAdapter.dateAdapter(now));
+					}else{
+						sqlBuilder.append(String.format(" AND( %s between %s AND %s or %s between %s AND %s )",
+								"po.validUntil",
+								dateQueryAdapter.dateConverAdapter2(startTime + " 00:00:00", "yyyy-mm-dd HH24:MI:SS"),
+								dateQueryAdapter.dateConverAdapter2(endTime + " 23:59:59", "yyyy-mm-dd HH24:MI:SS"),
+								"po.warningUntil",
+								dateQueryAdapter.dateConverAdapter2(startTime + " 00:00:00", "yyyy-mm-dd HH24:MI:SS"),
+								dateQueryAdapter.dateConverAdapter2(endTime + " 23:59:59", "yyyy-mm-dd HH24:MI:SS")));
+					}
 					break;
 			}