diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 39c3411..eb4e7c5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -185,6 +185,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //新生儿筛查状态 private String sieveStatus; + private List sieveStatusList; + + public List getSieveStatusList() { + return sieveStatusList; + } + + public void setSieveStatusList(List sieveStatusList) { + this.sieveStatusList = sieveStatusList; + } + public String getSieveStatus() { return sieveStatus; } @@ -928,9 +938,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != expVip) { condition = condition.and("expVip", expVip, MongoOper.IS); } - if(null != sieveStatus){ + if(null != sieveStatus && !"0".equals(sieveStatus)){ condition = condition.and("sieveStatus", sieveStatus, MongoOper.IS); } + if(null != sieveStatusList){ + condition = condition.and("sieveStatus", sieveStatusList, MongoOper.NIN); + + } + Criteria c = null; if (null != birthStart) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 8fa0cf6..3f83f9e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -267,7 +267,11 @@ public class BabySieveFacede { babyModelQuery.setDeformityKey(babySieveAddRequest.getDeformityKey()); babyModelQuery.setDueType(StringUtils.isEmpty(babySieveAddRequest.getDueType()) ? null : babySieveAddRequest.getDueType()); if("0".equals(babySieveAddRequest.getSieveStatus())){ - babyModelQuery.setSieveStatus(null); + List sieveStatusList = new ArrayList<>(); + sieveStatusList.add("1"); + sieveStatusList.add("2"); + sieveStatusList.add("3"); + babyModelQuery.setSieveStatusList(sieveStatusList); }else { babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus()); }