diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java
index e1b9d9369..6073e7b22 100644
--- a/src/main/java/com/nis/util/ConfigServiceUtil.java
+++ b/src/main/java/com/nis/util/ConfigServiceUtil.java
@@ -397,8 +397,12 @@ public class ConfigServiceUtil {
 		builder.queryParam("searchBusinessType",type);
 		builder.queryParam("searchService",serviceIds);
 		builder.queryParam("searchCfgId",ids);
-		builder.queryParam("searchReportStartTime",searchReportStartTime);
-		builder.queryParam("searchReportEndTime",searchReportEndTime);
+		if(StringUtils.isNotBlank(searchReportStartTime)) {
+			builder.queryParam("searchReportStartTime",searchReportStartTime);
+		}
+		if(StringUtils.isNotBlank(searchReportEndTime)) {
+			builder.queryParam("searchReportEndTime",searchReportEndTime);
+		}
 		URI uri=builder.build();
 		//创建连接
 		ClientUtil.initClient();
diff --git a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
index 0c6f37d17..b2ca885b9 100644
--- a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
@@ -53,46 +53,49 @@ import net.sf.json.JsonConfig;
 public class NtcPzReportController extends BaseController{
 	@RequestMapping(value="ajaxGetLogTotal",method=RequestMethod.POST)
 	@ResponseBody
-	public List<Map<String, Object>> ajaxGetLogTotal(Model model,long endTime,String actions,Integer functionId,String compileIds){
+	public List<Map<String, Object>> ajaxGetLogTotal(Model model,Long endTime,String actions,Integer functionId,String compileIds){
 		List<Map<String, Object>> dataList=new ArrayList<>();
 		SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
 		Date endDate=null;
 		Date startDate=null;
-		if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) {
-			try {
-				startDate=sdf.parse(Constants.LOG_TIME_START);
-				if(StringUtils.isNotBlank(Constants.LOG_TIME_END)) {
-					endDate=sdf.parse(Constants.LOG_TIME_END);
-				}else {
-					endDate=new Date(endTime);
+		if(endTime!=null) {
+			if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) {
+				try {
+					startDate=sdf.parse(Constants.LOG_TIME_START);
+					if(StringUtils.isNotBlank(Constants.LOG_TIME_END)) {
+						endDate=sdf.parse(Constants.LOG_TIME_END);
+					}else {
+						endDate=new Date(endTime);
+					}
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-			} catch (ParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				
+			}else {
+				Calendar cal=Calendar.getInstance();
+				//分钟间隔
+				int interval=Constants.LOG_TIME_RANGE/1000/60;
+				cal.setTimeInMillis(endTime);
+				if(interval<60) {//5分钟
+					cal.set(Calendar.SECOND, 0);
+					int minute=cal.get(Calendar.MINUTE);
+					cal.set(Calendar.MINUTE,minute/interval*interval);
+				}else {//1小时
+					cal.set(Calendar.SECOND, 0);
+					cal.set(Calendar.MINUTE, 0);
+				}
+				Calendar endTimeCal=Calendar.getInstance();
+				endTimeCal.setTimeInMillis(cal.getTimeInMillis());
+				//endTimeCal.add(Calendar.SECOND, -1);
+				endDate=endTimeCal.getTime();
+				cal.add(Calendar.MINUTE, -interval);
+				startDate=cal.getTime();
 			}
-			
-		}else {
-			Calendar cal=Calendar.getInstance();
-			//分钟间隔
-			int interval=Constants.LOG_TIME_RANGE/1000/60;
-			cal.setTimeInMillis(endTime);
-			if(interval<60) {//5分钟
-				cal.set(Calendar.SECOND, 0);
-				int minute=cal.get(Calendar.MINUTE);
-				cal.set(Calendar.MINUTE,minute/interval*interval);
-			}else {//1小时
-				cal.set(Calendar.SECOND, 0);
-				cal.set(Calendar.MINUTE, 0);
-			}
-			Calendar endTimeCal=Calendar.getInstance();
-			endTimeCal.setTimeInMillis(cal.getTimeInMillis());
-			//endTimeCal.add(Calendar.SECOND, -1);
-			endDate=endTimeCal.getTime();
-			cal.add(Calendar.MINUTE, -interval);
-			startDate=cal.getTime();
+			logger.info("log search end time:"+sdf.format(endDate));
+			logger.info("log search start time:"+sdf.format(startDate));
 		}
-		logger.info("log search end time:"+sdf.format(endDate));
-		logger.info("log search start time:"+sdf.format(startDate));
+		
 		String serviceIdsStr="";
 		StringBuffer serviceIds=new StringBuffer();
 		List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); 
@@ -107,7 +110,7 @@ public class NtcPzReportController extends BaseController{
 		if(serviceIds.toString().endsWith(",")) {
 			serviceIdsStr=serviceIds.toString().substring(0,serviceIds.toString().lastIndexOf(","));
 		}
-		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIdsStr, sdf.format(startDate), sdf.format(endDate));
+		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIdsStr, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
 		List<NtcPzReport> list=getList(json);
 		String[] idArr=compileIds.split(",");
 		if(list!=null&&(list.size()>0)){
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index e808b89bb..c42153737 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1340,12 +1340,12 @@ var getTotalLog=function(){
 }
 var GetLogTotal=function(_data){
 	var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
-	var timeStamp=0;
+	var timeStamp;
 	if(_data.date){
 		timeStamp=_data.date.valueOf(); 
-	}else{
+	}/*else{
 		timeStamp=(new Date()).valueOf(); 
-	}
+	}*/
 	var totalTrs=$(_data.objs);
 	var timeout=$.validator.messages.timeout;
 	var failed=$.validator.messages.failed;