Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionView.jsp
===================================================================
diff -u -r24034 -r24038
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionView.jsp	(.../scheduleDefinitionView.jsp)	(revision 24034)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionView.jsp	(.../scheduleDefinitionView.jsp)	(revision 24038)
@@ -12,6 +12,7 @@
 <link rel="stylesheet" href="${ctx}/bootstrap-table/css/bootstrap-table.css">
 <link rel="stylesheet" href="${ctx}/bootstrap-select/dist/css/bootstrap-select.min.css">
 <link href="http://cdn.bootcss.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+<link rel="stylesheet" href="${ctx}/bootstrap-datetimepicker/branch/css/bootstrap-datetimepicker.min.css">
 
 <style type="text/css">
 	#footer_buttons{
@@ -124,8 +125,12 @@
 		 <script type="text/javascript" src="${ctx}/reveal/jquery.reveal.js"></script> 
 		 <%-- 时间控件 --%>
 		<script language="javascript" type="text/javascript" src="${ctx}/js/my97DatePicker/WdatePicker.js"></script>
+		<%-- 时间控件 --%>
+	 	<script language="javascript" type="text/javascript" src="${ctx}/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
+	 	<script language="javascript" type="text/javascript" src="${ctx}/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.zh-CN.js"></script>
 		<!-- 引入自身js -->
-		<script type="text/javascript" src="scheduleDefinition.js"></script>   
+		<script type="text/javascript" src="scheduleDefinition.js"></script>
+		<script type="text/javascript" src="tools.js"></script>   
 </body>
     <script type="text/javascript">
     var WWWROOT = '${ctx}';
Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js
===================================================================
diff -u -r24036 -r24038
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js	(.../scheduleDefinition.js)	(revision 24036)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js	(.../scheduleDefinition.js)	(revision 24038)
@@ -93,17 +93,37 @@
     var handlerDepartmentStore=getHandlerDepartStore();
     //添加内容到下拉框
     var handlerDepartment_select="";
-    for(var i=0;i<handlerDepartmentStore.length;i++){
-    	handlerDepartment_select=handlerDepartment_select+"<option value='"+handlerDepartmentStore[i].cssdOrgUnitCode+"'>"+handlerDepartmentStore[i].cssdOrgUnitName+"</option>";
-    }
+    //目前只选当前科室，之后需求需要变动为多科室，这里先注释
+//    for(var i=0;i<handlerDepartmentStore.length;i++){
+    	handlerDepartment_select=handlerDepartment_select+"<option value='"+handlerDepartmentStore.orgUnitCoding+"'>"+handlerDepartmentStore.orgUnitName+"</option>";
+//    }
     $("#select_department").append(handlerDepartment_select);
     
     //添加表单--点击按钮跳出时间选择框
-     $("#startWorkTime,#offWorkTime").click(function(){
-    	 var t=$(this).attr("id")+"_input";
-    	 WdatePicker({el:t,dateFmt:'HH:mm:ss'});
-     });
+//     $("#startWorkTime,#offWorkTime").click(function(){
+//    	 var t=$(this).attr("id")+"_input";
+//    	 initSchedulingDate(t);
+////    	 WdatePicker({el:t,dateFmt:'HH:mm'});
+//     });
      
+     initSchedulingDate("startWorkTime_input");
+     initSchedulingDate("offWorkTime_input");
+     function initSchedulingDate(idStr){
+	 	$('#' + idStr).datetimepicker({
+		    format: 'HH:mm',
+		    language:'zh_CN'
+		})
+	}
+    var scheduleDefinitions=getAllScheduleDefinition();
+    
+    //"班次名称"输入框输入完成后校验是否已存在相同的名称的班次定义
+    $("#name").change(function(){
+    		var sheduleName=$("#name").val();
+	    	if(isExistSameSheduleName(sheduleName,scheduleDefinitions)==true){
+	    		alert("已存在相同班次名称，请重新输入!");
+	   	 	}
+    });
+    
      //提交表单--begin
      $("#confirm").click(function(){
     	 var verification=true;
@@ -117,12 +137,18 @@
     	 if(isUndefinedOrNullOrEmpty(sheduleName)){
     		 alert("请输入班次名称!");
     		 verification=false;
+    	 }else if(isExistSameSheduleName(sheduleName,scheduleDefinitions)==true){//判断是否已存在相同名称的班次定义
+    		 alert("已存在相同班次名称，请重新输入!");
+    		 verification=false;
     	 }else if(isUndefinedOrNullOrEmpty(startWorkingTime)){
     		 alert("请选择上班时间!");
     		 verification=false;
     	 }else if(isUndefinedOrNullOrEmpty(endWorkingTime)){
     		 alert("请选择下班时间!");
     		 verification=false;
+    	 }else if(dateCompare(startWorkingTime, endWorkingTime)!=1){
+    		 alert("下班时间必须大于上班时间!");
+    		 verification=false;
     	 }
     		 
     	if(verification){	 
@@ -154,7 +180,6 @@
     			 }
     		 });
 	    	 
-	    	 
 	    	 $('#myModal').modal('hide');
 	    	 //清空表单数据
 	    	 $('#select_department').val("");
@@ -268,13 +293,13 @@
 //加载可设置的科室数据
 function getHandlerDepartStore(){
 	 var handlerDpertmentStore=[];
- 	$.ajax({
- 		url:WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do',
+ 	$.ajax({			
+ 		url:WWWROOT + '/systemmanage/orgUnit/getCurrentOrgUnit.do',//OrgUnitAction!getCurrentOrgUnit
  		type:'get',
  		dataType:'json',
  		async:false,
  		success:function(msg){
- 			handlerDpertmentStore=msg.data;
+ 			handlerDpertmentStore=msg;
  		}
  	});
  	return handlerDpertmentStore;
@@ -294,4 +319,34 @@
 	return false;
 }
 
+//判断是否有已定义的相同班次名称
+function isExistSameSheduleName(sheduleName,scheduleDefinitions){
+		for(var i=0;i<scheduleDefinitions.length;i++){
+			if(scheduleDefinitions[i].sheduleName==sheduleName){
+				return true;
+				break;
+			}
+		}
+	
+	return false;
+}
 
+
+//加载班次定义信息
+function getAllScheduleDefinition(){
+	 var scheduleDefinitions=[];
+	$.ajax({			
+		url:WWWROOT + '/disinfectSystem/scheduleDefinition/findScheduleDefinitions.mhtml',
+		contentType:"application/json;charset=utf-8",   
+		type:'POST',
+		data:JSON.stringify({isAll :'false'}),
+		dataType:'json',
+		async:false,
+		success:function(msg){
+			scheduleDefinitions=msg.data.data;
+		},error:function(){
+			alert("error");
+		}
+	});
+	return scheduleDefinitions;
+}
Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js
===================================================================
diff -u -r24036 -r24038
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js	(.../scheduleInformation.js)	(revision 24036)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js	(.../scheduleInformation.js)	(revision 24038)
@@ -307,6 +307,11 @@
 		 		if(isUndefinedOrNullOrEmpty(start)||isUndefinedOrNullOrEmpty(end)){
 		 			if(isUndefinedOrNullOrEmpty(start)&&isUndefinedOrNullOrEmpty(end)){
 		 				isOk=0;
+		 				if(num==0){
+		 					canCommmit=false;
+		 					isOk=-1;
+		 					alert("请至少选择一组时间!");
+		 				}
 		 			}else{
 		 				canCommmit=false;
 		 				isOk=-1;