Преглед на файлове

性别年龄过滤更新

hujing преди 5 години
родител
ревизия
8230d30bf3
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      bigdata-web/src/main/java/org/diagbot/bigdata/work/ResultDataProxy.java

+ 2 - 2
bigdata-web/src/main/java/org/diagbot/bigdata/work/ResultDataProxy.java

@@ -186,12 +186,12 @@ public class ResultDataProxy {
                         isFirst = false;
                     }
                     //年龄过滤
-                    if (filter.getAgeStart() > -1 && searchData.getAge() != 0 && searchData.getAge() < filter.getAgeEnd()) {
+                    if (isFirst && filter.getAgeStart() > -1 && searchData.getAge() != 0 && searchData.getAge() < filter.getAgeEnd()) {
                         isFirst = true;
                     } else {
                         isFirst = false;
                     }
-                    if (filter.getAgeEnd() > -1 && searchData.getAge() != 0 && searchData.getAge() > filter.getAgeStart()) {
+                    if (isFirst && filter.getAgeEnd() > -1 && searchData.getAge() != 0 && searchData.getAge() > filter.getAgeStart()) {
                         isFirst = true;
                     } else {
                         isFirst = false;