Merge branch 'master' of http://192.168.1.220:10080/EHR/svr-quota

src/main/java/com/yihu/quota/service/quota/BaseStatistsService.java

@@ -299,7 +299,7 @@ public class BaseStatistsService {
        if(StringUtils.isEmpty(dimension) && StringUtils.isNotEmpty(dateType)){
            dimension = dateType;
        }
        List<Map<String, Object>> moleList = getSimpleQuotaReport(molecular, molecularFilter,dimension ,false , null);
        List<Map<String, Object>> moleList = getSimpleQuotaReport(molecular, molecularFilter,dimension ,false , top);
        List<Map<String, Object>> denoList =  getSimpleQuotaReport(denominator,denominatorFilters,dimension,false, null);
        dimension = StringUtils.isNotEmpty(dateType)? (StringUtils.isNotEmpty(dimension)? dimension +";"+dateType : dateType):dimension;