Merge branch 'feature/eta1.9.7_interval_analysis' of eta_server/eta_api into master

services/data/range_analysis/chart_info.go

@@ -660,7 +660,7 @@ func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int,
 			}
 			var condition string
 			var pars []interface{}
-			condition = " edb_info_id in (" + utils.GetOrmInReplace(len(edbIds)) + ") "
+			condition = " and edb_info_id in (" + utils.GetOrmInReplace(len(edbIds)) + ") "
 			pars = append(pars, edbIds)
 			count, e := data_manage.GetEdbInfoCountByCondition(condition, pars)
 			if e != nil {