Index: ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleInformationController.java
===================================================================
diff -u -r24032 -r24149
--- ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleInformationController.java	(.../ScheduleInformationController.java)	(revision 24032)
+++ ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleInformationController.java	(.../ScheduleInformationController.java)	(revision 24149)
@@ -31,7 +31,7 @@
  *
  */
 @RestController
-@RequestMapping(value ="/disinfectSystem/scheduleInformation")
+@RequestMapping(value ="/disinfectSystem/scheduleInformationController")
 public class ScheduleInformationController {
 	
 	@Resource
Index: ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java
===================================================================
diff -u -r24042 -r24149
--- ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java	(.../ScheduleInformationManagerImpl.java)	(revision 24042)
+++ ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java	(.../ScheduleInformationManagerImpl.java)	(revision 24149)
@@ -66,9 +66,9 @@
 		
 		//where 
 		String where = " where 1=1 ";
+		//时间过滤：若开始时间和结束时间都不为空则按：时间段来过滤 否则 默认本周7天的排班信息
 		//记录查询时间访问(用于前台显示)
 		List<ConditionTimesVo> conditionTimes = new ArrayList<ConditionTimesVo>();
-		//若开始时间和结束时间都不为空则按：时间段来过滤 否则 默认本周7天的排班信息
 		if(StringUtils.isNotEmpty(startTimeStr) && StringUtils.isNotEmpty(endTimeStr)){
 			if(!DateTools.isValidDate(startTimeStr,DateTools.COMMON_DATE_ONLY) || !DateTools.isValidDate(endTimeStr,DateTools.COMMON_DATE_ONLY)){
 				throw new RuntimeException("时间格式不正确：startTime:"+startTimeStr+",endTime:"+endTimeStr);
Index: ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManagerImpl.java
===================================================================
diff -u -r24051 -r24149
--- ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManagerImpl.java	(.../ScheduleDefinitionManagerImpl.java)	(revision 24051)
+++ ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManagerImpl.java	(.../ScheduleDefinitionManagerImpl.java)	(revision 24149)
@@ -142,7 +142,7 @@
 		//保存数据
 		saveOrUpdateScheduleDefinition_PROPERTY(sd,sdDTO,operationStatus,update,userData,orgunit);
 		objectDao.saveOrUpdate(sd);
-		//5、新建历史记录
+		//5、保存一条新增的数据（用于历史记录）
 		saveHistoryScheduleDefinition(sd,userData,operationStatus);
 		//6、写日志
 		writeLog_saveOrupdate(sd,update);
@@ -177,13 +177,13 @@
 			}
 			//5、更新
 			//保存一条更新前的数据（用于历史记录）
-			saveHistoryScheduleDefinition(nowSd,userData,operationStatus);
+			//saveHistoryScheduleDefinition(nowSd,userData,operationStatus);
 			//修改数据
 			saveOrUpdateScheduleDefinition_PROPERTY(nowSd,sdDTO,operationStatus,update,userData,orgunit);
 			objectDao.saveOrUpdate(nowSd);
-			//保存一条更新后的数据（用于历史记录）
+			//6、保存一条更新后的数据（用于历史记录）
 			saveHistoryScheduleDefinition(nowSd,userData,operationStatus);
-			//6、写日志
+			//7、写日志
 			writeLog_saveOrupdate(nowSd,update);
 		}else{
 			throw new RuntimeException("id参数有误:"+id);
@@ -342,9 +342,9 @@
 	 */
 	private void saveOrUpdateScheduleDefinition_PROPERTY(ScheduleDefinition sd,ScheduleDefinitionDTO sdDTO,
 			String operationStatus,boolean update,LoginUserData userData,OrgUnit orgunit){
-		//不会更新则需要设置编号，源定义，创建人
+		//不为更新则需要设置编号，源定义，创建人
 		if(!update && ScheduleDefinition.OPERATIONSTATUS_ADD.equals(operationStatus)){
-			sd.setSerialNumber(serialNumManager.getSerialNumberStr(SerialNum.TYPE_EXPENSIVEGOODS_BILL));//唯一编号
+			sd.setSerialNumber(serialNumManager.getSerialNumberStr(SerialNum.TYPE_SCHEDULE_DEFINITION));//唯一编号
 			sd.setIsSource(true);//源定义(用来区分是否历史记录)
 			sd.setCreateTime(new Date());//创建时间
 			sd.setCreatedUserId(userData.getUserId());//创建人id
Index: ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleDefinitionController.java
===================================================================
diff -u -r24035 -r24149
--- ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleDefinitionController.java	(.../ScheduleDefinitionController.java)	(revision 24035)
+++ ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleDefinitionController.java	(.../ScheduleDefinitionController.java)	(revision 24149)
@@ -41,7 +41,7 @@
  *
  */
 @RestController
-@RequestMapping(value ="/disinfectSystem/scheduleDefinition")
+@RequestMapping(value ="/disinfectSystem/scheduleDefinitionController")
 public class ScheduleDefinitionController {
 	
 	@Autowired
Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js
===================================================================
diff -u -r24052 -r24149
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js	(.../scheduleInformation.js)	(revision 24052)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js	(.../scheduleInformation.js)	(revision 24149)
@@ -185,7 +185,7 @@
 	 		//将数据提交到后台并隐藏弹框
 	 		var isSuccess=true;
 	 			$.ajax({			
-	 				url:WWWROOT + '/disinfectSystem/scheduleInformation/addScheduleInformation.mhtml',
+	 				url:WWWROOT + '/disinfectSystem/scheduleInformationController/addScheduleInformation.mhtml',
 	 				contentType:"application/json;charset=utf-8",   
 	 				type:'POST',
 	 				data:JSON.stringify(new scheduleInformation(userIds,scheduleDefinitionId,timeFrames)),
@@ -225,7 +225,7 @@
 		 }
 		
 		 $.ajax({			
-			 url:WWWROOT + '/disinfectSystem/scheduleInformation/deleteFutureScheduleInformation.mhtml?time='+new Date(),
+			 url:WWWROOT + '/disinfectSystem/scheduleInformationController/deleteFutureScheduleInformation.mhtml?time='+new Date(),
 			 data:{'userIds':ids.join(';')},
 			 type:'GET',
 			 async:false,
@@ -263,7 +263,7 @@
 function getAllScheduleDefinition(){
 	 var scheduleDefinitions=[];
 	$.ajax({			
-		url:WWWROOT + '/disinfectSystem/scheduleDefinition/findScheduleDefinitions.mhtml',
+		url:WWWROOT + '/disinfectSystem/scheduleDefinitionController/findScheduleDefinitions.mhtml',
 		contentType:"application/json;charset=utf-8",   
 		type:'POST',
 		data:JSON.stringify({
@@ -285,7 +285,7 @@
 function getAllScheduleInformations(queryParams){
 	var scheduleInformations=[];
 	$.ajax({			
-		url:WWWROOT + '/disinfectSystem/scheduleInformation/findUserScheduleInformations.mhtml?time='+new Date(),
+		url:WWWROOT + '/disinfectSystem/scheduleInformationController/findUserScheduleInformations.mhtml?time='+new Date(),
 		type:'POST',
 		data:queryParams,
 		dataType:'json',
@@ -323,7 +323,7 @@
 //更新人员假期天数
 function updateUserHoliDay(jsonObject){
 	$.ajax({			
-		url:WWWROOT + '/disinfectSystem/scheduleInformation/saveOrUpdateHoliday.mhtml',
+		url:WWWROOT + '/disinfectSystem/scheduleInformationController/saveOrUpdateHoliday.mhtml',
 		type:'POST',
 		data:jsonObject,
 		dataType:'json',
@@ -339,7 +339,7 @@
 //更新人员排班
 function updateUserSchedule(jsonObject){
 	$.ajax({			
-		url:WWWROOT + '/disinfectSystem/scheduleInformation/saveOrUpdateScheduleInformations.mhtml',
+		url:WWWROOT + '/disinfectSystem/scheduleInformationController/saveOrUpdateScheduleInformations.mhtml',
 		type:'POST',
 		data:jsonObject,
 		cache:false,
@@ -356,7 +356,7 @@
 function getUsers(){
 	var users=[];
 	$.ajax({			
-		url:WWWROOT + '/disinfectSystem/scheduleDefinition/findUserByKeyWordAndNowOrgUnit.mhtml',
+		url:WWWROOT + '/disinfectSystem/scheduleDefinitionController/findUserByKeyWordAndNowOrgUnit.mhtml',
 		type:'get',
 		
 		dataType:'json',
Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js
===================================================================
diff -u -r24052 -r24149
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js	(.../scheduleDefinitionHistory.js)	(revision 24052)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js	(.../scheduleDefinitionHistory.js)	(revision 24149)
@@ -105,7 +105,7 @@
 function getAllScheduleDefinition(){
 	 var scheduleDefinitions=[];
 	$.ajax({			
-		url:WWWROOT + '/disinfectSystem/scheduleDefinition/findScheduleDefinitions.mhtml',
+		url:WWWROOT + '/disinfectSystem/scheduleDefinitionController/findScheduleDefinitions.mhtml',
 		contentType:"application/json;charset=utf-8",   
 		type:'POST',
 		data:JSON.stringify({
Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js
===================================================================
diff -u -r24052 -r24149
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js	(.../scheduleDefinition.js)	(revision 24052)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js	(.../scheduleDefinition.js)	(revision 24149)
@@ -54,7 +54,7 @@
       	 var isSuccess=true;
       	if(verification){	 
   	    	 $.ajax({
-      			 url:WWWROOT + '/disinfectSystem/scheduleDefinition/saveOrUpdateScheduleDefinition.mhtml?time='+new Date(),
+      			 url:WWWROOT + '/disinfectSystem/scheduleDefinitionController/saveOrUpdateScheduleDefinition.mhtml?time='+new Date(),
       			 contentType:"application/json;charset=utf-8",
       			 data:JSON.stringify(new scheduleDefinition(id,sheduleName,endWorkingTime,startWorkingTime,orgUnitCode,remark)),
       			 type:'post',
@@ -144,7 +144,7 @@
     		 }
     		
     		 $.ajax({
-    			 url:WWWROOT + '/disinfectSystem/scheduleDefinition/scheduleDefinitionStatueToDelete.mhtml?time='+new Date(),
+    			 url:WWWROOT + '/disinfectSystem/scheduleDefinitionController/scheduleDefinitionStatueToDelete.mhtml?time='+new Date(),
     			 data:{'ids':ids.join(';')},
     			 type:'POST',
     			 async:false,
@@ -249,7 +249,7 @@
 function getAllScheduleDefinition(){
 	 var scheduleDefinitions=[];
 	$.ajax({			
-		url:WWWROOT + '/disinfectSystem/scheduleDefinition/findScheduleDefinitions.mhtml',
+		url:WWWROOT + '/disinfectSystem/scheduleDefinitionController/findScheduleDefinitions.mhtml',
 		contentType:"application/json;charset=utf-8",   
 		type:'POST',
 		data:JSON.stringify({
Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionView.jsp
===================================================================
diff -u -r24052 -r24149
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionView.jsp	(.../scheduleDefinitionView.jsp)	(revision 24052)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionView.jsp	(.../scheduleDefinitionView.jsp)	(revision 24149)
@@ -44,7 +44,7 @@
 			                <h4 class="modal-title" id="myModalLabel"></h4>
 			            </div>
 			            <div class="modal-body">	
-			            	<form class="form-horizontal" role="form" id="scheduleDefinition_form" action="${ctx}/disinfectSystem/scheduleDefinition/save.mhtml" method="post">
+			            	<form class="form-horizontal" role="form" id="scheduleDefinition_form" action="${ctx}/disinfectSystem/scheduleDefinitionController/save.mhtml" method="post">
 								  <div class="form-group">
 								    <label for="firstname" class="col-sm-2 control-label">选择科室</label>
 								    <div class="col-sm-10">