liquanyu / regional-platform

Download as
Browse Code »

Commit d460b9dad78158f987be6b5a0841e98d3a68a373

Authored by liquanyu
1 parent f8139eaceb
Exists in master and in 1 other branch dev

分娩

Showing 1 changed file with 17 additions and 14 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ d460b9d
... ... @@ -758,23 +758,10 @@
758 758 if (null != malformation) {
759 759 condition = condition.and("malformation", malformation, MongoOper.IS);
760 760 }
761   - List<MongoCondition> mongoCondits = new ArrayList<>();
762 761  
763   - if (-1 != yn) {
764   - condition = condition.and("yn", yn, MongoOper.IS);
765   - } else {
766   - if (dataStatus != null) {
767   - if (dataStatus) {//分娩自动建档
768   - condition = condition.and("dataStatus", 1, MongoOper.NE);
769   - } else {
770   - mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS));
771   - mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
772   - condition = condition.andCondition(condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])));
773   - }
774   - }
775   - }
776 762  
777 763  
  764 +
778 765 if (null != buildType) {
779 766 condition = condition.and("buildType", buildType, MongoOper.IS);
780 767 }
... ... @@ -970,6 +957,22 @@
970 957 c = c.lte(birthEnd);
971 958 } else {
972 959 c = Criteria.where("birth").lte(birthEnd);
  960 + }
  961 + }
  962 +
  963 +
  964 + if (-1 != yn) {
  965 + condition = condition.and("yn", yn, MongoOper.IS);
  966 + } else {
  967 + if (dataStatus != null) {
  968 + if (dataStatus) {//分娩自动建档
  969 + condition = condition.and("dataStatus", 1, MongoOper.NE);
  970 + } else {
  971 + List<MongoCondition> mongoCondits = new ArrayList<>();
  972 + mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS));
  973 + mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
  974 + condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
  975 + }
973 976 }
974 977 }
975 978