Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r34349 -r34917
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 34349)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 34917)
@@ -1315,7 +1315,6 @@
 //		return "删除成功";
 	}
 
-	@SuppressWarnings("unchecked")
 	public String findWarningTousseGoodsTableList(
 			Map<String, List<String>> parameterMap) {
 		Map<String, String> sqlWhereParamMap = gridManager
@@ -1356,19 +1355,37 @@
 		String endTime = sqlWhereParamMap.get("endTime");
 		switch (type) {
 			case SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE:
-				sqlBuilder.append(" AND po.validUntil < " + dateQueryAdapter.dateAdapter(nowDateForValidUtil));
+				if(StringUtils.isBlank(startTime)
+						|| StringUtils.isBlank(endTime)){
+					sqlBuilder.append(" AND po.validUntil < " + dateQueryAdapter.dateAdapter(nowDateForValidUtil));
+				}else{
+					setQueryTime(sqlBuilder, "po.validUntil", startTime, endTime);
+				}
 				sqlBuilder.append(" AND po.tousseDefinition.ancestorID not in (select ancestorID from TousseDefinition where ( warningType in ('" + TousseDefinition.WARNING_TYPE_NEVERWARN + "', '" + TousseDefinition.WARNING_TYPE_TOUSSE + "'))) ");
-				setQueryTime(sqlBuilder, "po.validUntil", startTime, endTime);
 				break;
 			case SystemWarningItemVO.WARNING_TYPE_TOUSSE:
-				sqlBuilder.append(" AND po.warningUntil < " + dateQueryAdapter.dateAdapter(nowDateForWarningUtil));
-				sqlBuilder.append(" AND po.validUntil > " + dateQueryAdapter.dateAdapter(nowDateForValidUtil));
+				if(StringUtils.isBlank(startTime)
+						|| StringUtils.isBlank(endTime)){
+					sqlBuilder.append(" AND po.warningUntil < " + dateQueryAdapter.dateAdapter(nowDateForWarningUtil));
+					sqlBuilder.append(" AND po.validUntil > " + dateQueryAdapter.dateAdapter(nowDateForValidUtil));
+				}else{
+					setQueryTime(sqlBuilder, "po.warningUntil", startTime, endTime);
+				}
 				sqlBuilder.append(" AND po.tousseDefinition.ancestorID not in (select ancestorID from TousseDefinition where ( warningType in ('" + TousseDefinition.WARNING_TYPE_NEVERWARN + "', '" + TousseDefinition.WARNING_TYPE_DISABLED_TOUSSE + "'))) ");
-				setQueryTime(sqlBuilder, "po.warningUntil", startTime, endTime);
 				break;
 			default:  //默认显示已过期和即将过期的所有器械包
-				sqlBuilder.append(" AND po.warningUntil < " + dateQueryAdapter.dateAdapter(nowDateForWarningUtil));
-				setQueryTime(sqlBuilder, "po.warningUntil", startTime, endTime);
+				if(StringUtils.isBlank(startTime)
+						|| StringUtils.isBlank(endTime)){
+					sqlBuilder.append(" AND po.warningUntil < " + dateQueryAdapter.dateAdapter(nowDateForWarningUtil));
+				} 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;
 		}
 		//器械包类型