Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r16050 -r16054
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16050)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16054)
@@ -2502,7 +2502,7 @@
 		ForgonDateUtils.setTime(now, 23, 59, 59);
 		String todayStr = sdf.format(now.getTime());
 
-		boolean spliteToday = true;
+		boolean spliteToday = Boolean.parseBoolean(StringTools.defaultIfEmpty(CssdUtils.getSystemSetConfigByName("showMorAndAf"),"false"));
 		if(spliteToday){
 			applyDateMap = new HashMap<String, String>();
 			ForgonDateUtils.setTime(now, 0, 0, 0);