Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r27761 -r28280
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 27761)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 28280)
@@ -540,12 +540,12 @@
 			}
 			Date now = new Date();
 			StringBuffer querySql = new StringBuffer("");
-			querySql.append("select tt.deviceName,tt.createDate,tt.customerCycleDays, tt.warningDays,tt.lastMaintenanceTime ,tt.nextCycleMaintenanceTime,tt.nextCycleMaintenanceWarningTime from ( ");
+			querySql.append("select tt.deviceName,tt.createDate,tt.customerCycleDays, tt.warningDays,tt.lastMaintenanceTime ,tt.nextCycleMaintenanceTime,tt.nextCycleMaintenWarningTime from ( ");
 			querySql.append("select t.deviceName,t.createDate,t.customerCycleDays, t.warningDays,t.lastMaintenanceTime ");
 			querySql.append(",case when t.lastMaintenanceTime is null then (t.createDate + t.customerCycleDays) ");
 			querySql.append("else (t.lastMaintenanceTime + t.customerCycleDays) end nextCycleMaintenanceTime ");
 			querySql.append(",case when t.lastMaintenanceTime is null then (t.createDate + t.customerCycleDays - t.warningDays) ");
-			querySql.append("else (t.lastMaintenanceTime + t.customerCycleDays - t.warningDays) end nextCycleMaintenanceWarningTime ");
+			querySql.append("else (t.lastMaintenanceTime + t.customerCycleDays - t.warningDays) end nextCycleMaintenWarningTime ");
 			querySql.append("from ( ");
 			querySql.append("select t2.formName deviceName,t2.createDate, t1.customerCycleDays, t1.warningDays ");
 			querySql.append(",(select max(dmci.maintenanceTime) from "+ DeviceMaintenanceCusI.class.getSimpleName() +" dmci join "+ FormInstance.class.getSimpleName() +" fi on dmci.id=fi.id ");
@@ -560,7 +560,7 @@
 			querySql.append("where 1=1 and t3.formType='"+ FormDefinition.FOMRTYPE_DEVICEMAINTENANCE +"' and ").append(departCodeCondition).append(" ");
 			querySql.append("group by t3.formName) ");
 			querySql.append(") t ");
-			querySql.append(") tt where (tt.nextCycleMaintenanceWarningTime < ").append(dateQueryAdapter.dateAdapter(now)).append(" or ").append("tt.nextCycleMaintenanceTime < ").append(dateQueryAdapter.dateAdapter(now)).append(")");
+			querySql.append(") tt where (tt.nextCycleMaintenWarningTime < ").append(dateQueryAdapter.dateAdapter(now)).append(" or ").append("tt.nextCycleMaintenanceTime < ").append(dateQueryAdapter.dateAdapter(now)).append(")");
 			querySql.append(" order by tt.nextCycleMaintenanceTime ");
 			ResultSet rs = null;
 			try {
@@ -570,13 +570,13 @@
 						list = new ArrayList<SystemWarningItemVO>();
 					}
 					String deviceName = rs.getString("deviceName");
-					Date nextCycleMaintenanceWarningTime = rs.getTimestamp("nextCycleMaintenanceWarningTime");
+					Date nextCycleMaintenWarningTime = rs.getTimestamp("nextCycleMaintenWarningTime");
 					Date nextCycleMaintenanceTime = rs.getTimestamp("nextCycleMaintenanceTime");
 					String warningItemType = null;
 					//如果
 					if(now.after(nextCycleMaintenanceTime)){
 						warningItemType = SystemWarningItemVO.WARNING_TYPE_DEVICEMAINTENANCE_OUTDATE;
-					}else if(now.after(nextCycleMaintenanceWarningTime)){
+					}else if(now.after(nextCycleMaintenWarningTime)){
 						warningItemType = SystemWarningItemVO.WARNING_TYPE_DEVICEMAINTENANCE;
 					}else{
 						continue;