Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r32932 -r32947
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 32932)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 32947)
@@ -3855,11 +3855,17 @@
 			reduceToNotWeek(calendar);
 			startDateStr = yearToDay.format(new Date(calendar.getTimeInMillis())) + " " +  arr.get(0).toString();
 			endDateStr =  yearToDay.format(newDate) + " " + arr.get(1).toString();
-			
-			long newDateTime = newDate.getTime();
+			String startDateStr2 =  yearToDay.format(newDate) + " " + arr.get(0).toString();
+			Date startDate2 = yearToMinutes.parse(startDateStr2);
 			Double outTime = Double.valueOf(outTimeInt);
 			Date endDate = yearToMinutes.parse(endDateStr);
 			Date startDate = yearToMinutes.parse(startDateStr);
+			if(startDate2.before(newDate)){
+				newDate = startDate2;
+			}else if(newDate.before(endDate)){
+				newDate = endDate;
+			}
+			long newDateTime = newDate.getTime();
 			Double ind  = 24 - (1.0 * (endDate.getTime() - startDate.getTime()) / 1000 /(60 * 60));
 			Double hour = 1.0 * (newDateTime - endDate.getTime()) / 1000 / (60 * 60);
 			if(hour.compareTo(outTime) >= 0){