Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r16058 -r16061
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16058)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16061)
@@ -2502,6 +2502,13 @@
 		ForgonDateUtils.setTime(now, 23, 59, 59);
 		String todayStr = sdf.format(now.getTime());
 
+
+		applyDateMap = new HashMap<String, String>();
+		applyDateMap.put("name", "今天");
+		ForgonDateUtils.setTime(now, 0, 0, 0);
+		applyDateMap.put("value", sdf.format(now.getTime()) + ";" + todayStr);
+		applyDateMapList.add(applyDateMap);
+	
 		boolean spliteToday = Boolean.parseBoolean(StringTools.defaultIfEmpty(CssdUtils.getSystemSetConfigByName("showMorAndAf"),"false"));
 		if(spliteToday){
 			applyDateMap = new HashMap<String, String>();
@@ -2521,12 +2528,6 @@
 			applyDateMap.put("name", "今天下午");
 			applyDateMap.put("value", start + ";" + end);
 			applyDateMapList.add(applyDateMap);
-		}else{
-			applyDateMap = new HashMap<String, String>();
-			applyDateMap.put("name", "今天");
-			ForgonDateUtils.setTime(now, 0, 0, 0);
-			applyDateMap.put("value", sdf.format(now.getTime()) + ";" + todayStr);
-			applyDateMapList.add(applyDateMap);
 		}
 		ForgonDateUtils.setTime(now, 0, 0, 0);
 		now.add(Calendar.DATE, -1);