diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
index e5dcc8427..e2d350583 100644
--- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
@@ -153,6 +153,8 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 				}
 			}
 		}else{
+			entity.setEditorId(entity.getCurrentUser().getId());
+			entity.setEditTime(new Date());
 			mailCfgDao.updateCfgIndex(entity);
 			//无效子配置后，再新增子配置
 			mailCfgDao.deleteMailIpCfg(entity);
diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
index c3e68e4b9..257482063 100644
--- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
@@ -184,6 +184,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			}
 			
 		}else{
+			entity.setEditorId(entity.getCurrentUser().getId());
+			entity.setEditTime(new Date());
 			websiteCfgDao.updateCfgIndex(entity);
 			//无效子配置后，再新增子配置
 			websiteCfgDao.deleteHttpIpCfg(entity);
@@ -562,6 +564,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			}
 			
 		}else{
+			entity.setEditorId(entity.getCurrentUser().getId());
+			entity.setEditTime(new Date());
 			websiteCfgDao.updateCfgIndex(entity);
 			//无效子配置后，再新增子配置
 			websiteCfgDao.deleteSslIpCfg(entity);
@@ -824,6 +828,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			}
 			
 		}else{
+			entity.setEditorId(entity.getCurrentUser().getId());
+			entity.setEditTime(new Date());
 			websiteCfgDao.updateCfgIndex(entity);
 			//无效子配置后，再新增子配置
 			websiteCfgDao.deleteDnsIpCfg(entity);
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index 4d3a66743..d6acfe5a1 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -53,14 +53,17 @@ $(document).ready(function(){
 							<div class="col-md-12">
 								<div class="pull-left">
 									<form:select path="action" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="action"/></form:option>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
-											<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<form:option value=""><spring:message code="action"/></form:option>
+									<c:forEach items="${serviceList}" var="service"
+											varStatus="satus">
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 9dc31f1ad..8030da5a1 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -286,16 +286,16 @@ function customColumnClick(){
  	   if(rows.length  > 1){
  		 var trtotal="";
  		if(reportBusinessType=="src_ip_report"){
-		    trtotal+="<td colspan='2' style='text-align: center;' ><spring:message code='report_total' />：</td>";
+		    trtotal+="<td colspan='2' style='text-align: left;' ><spring:message code='report_total' /></td>";
  		}else{
- 			 trtotal+="<td style='text-align: center;'><spring:message code='report_total' />：</td>";
+ 			 trtotal+="<td style='text-align: left;'><spring:message code='report_total' /></td>";
  		} 
 	 	for (var k = 0; k < list.length; k++) {
 			trtotal+="<td>"+list[k]+"</td>";
 		}
 		    trtotal+=""
 	 	$('#total').remove();
-		$('#'+tableId).append("<tr id='total'></tr>");
+		$('#'+tableId+" tbody").prepend("<tr id='total'></tr>");
 		$('#total').html(trtotal);
  	  } 
 }	  
@@ -308,7 +308,7 @@ function customColumnClick(){
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
 				<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
 				    <c:if test="${service.serviceId ne 5}">
-				      <c:if test="${(service.action ne 128) && (service.action ne 32)}" >
+				      <c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96)}" >
 					    <div data-service="${service.serviceId}" class="service btn 
 						<c:if test="${status.index%2==0}">btn-primary</c:if>
 						<c:if test="${status.index%2!=0}">btn-default</c:if>">
@@ -319,13 +319,15 @@ function customColumnClick(){
 					</c:if>
 				    </c:if>
 					 <c:if test="${service.serviceId eq 5}">
+					   <c:if test="${(service.action ne 128) && (service.action ne 96)}" >
 					    <div data-service="${service.serviceId}" class="service btn 
 						<c:if test="${status.index%2==0}">btn-primary</c:if>
 						<c:if test="${status.index%2!=0}">btn-default</c:if>">
 							<spring:message code="${action.itemValue}"/>
 							<spring:message code="log_total"/>
 							<span>0</span>
-						</div>
+						 </div>
+						</c:if>
 				    </c:if>
 				</c:if>
 			</c:forEach>
@@ -359,13 +361,15 @@ function customColumnClick(){
 										<c:forEach items="${serviceList}" var="service" >
 										<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
 										    <c:if test="${service.serviceId ne 5}">
-				    						 <c:if test="${(service.action ne 128) && (service.action ne 32)}" >
+				    						 <c:if test="${(service.action ne 128) && (service.action ne 32)  && (service.action ne 96) }" >
 											  <form:option value="${action.itemCode}" ><spring:message code="${action.itemValue}"/></form:option>
 											</c:if>
 										  </c:if>
 										   <c:if test="${service.serviceId  eq 5}">
+										      <c:if test="${(service.action ne 128) && (service.action ne 96) }" >
 											  <form:option value="${action.itemCode}" ><spring:message code="${action.itemValue}"/></form:option>
-										  </c:if>
+										     </c:if>
+										   </c:if>
 										</c:if>
 										</c:forEach>
 									</c:forEach>