Commit 1f4b488e263f521fbe855a09bb26b84241870fa2
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
1f4b488
| ... | ... | @@ -185,6 +185,16 @@ |
| 185 | 185 | //新生儿筛查状态 |
| 186 | 186 | private String sieveStatus; |
| 187 | 187 | |
| 188 | + private List sieveStatusList; | |
| 189 | + | |
| 190 | + public List getSieveStatusList() { | |
| 191 | + return sieveStatusList; | |
| 192 | + } | |
| 193 | + | |
| 194 | + public void setSieveStatusList(List sieveStatusList) { | |
| 195 | + this.sieveStatusList = sieveStatusList; | |
| 196 | + } | |
| 197 | + | |
| 188 | 198 | public String getSieveStatus() { |
| 189 | 199 | return sieveStatus; |
| 190 | 200 | } |
| 191 | 201 | |
| ... | ... | @@ -928,9 +938,14 @@ |
| 928 | 938 | if (null != expVip) { |
| 929 | 939 | condition = condition.and("expVip", expVip, MongoOper.IS); |
| 930 | 940 | } |
| 931 | - if(null != sieveStatus){ | |
| 941 | + if(null != sieveStatus && !"0".equals(sieveStatus)){ | |
| 932 | 942 | condition = condition.and("sieveStatus", sieveStatus, MongoOper.IS); |
| 933 | 943 | } |
| 944 | + if(null != sieveStatusList){ | |
| 945 | + condition = condition.and("sieveStatus", sieveStatusList, MongoOper.NIN); | |
| 946 | + | |
| 947 | + } | |
| 948 | + | |
| 934 | 949 | |
| 935 | 950 | Criteria c = null; |
| 936 | 951 | if (null != birthStart) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
View file @
1f4b488
| ... | ... | @@ -267,7 +267,11 @@ |
| 267 | 267 | babyModelQuery.setDeformityKey(babySieveAddRequest.getDeformityKey()); |
| 268 | 268 | babyModelQuery.setDueType(StringUtils.isEmpty(babySieveAddRequest.getDueType()) ? null : babySieveAddRequest.getDueType()); |
| 269 | 269 | if("0".equals(babySieveAddRequest.getSieveStatus())){ |
| 270 | - babyModelQuery.setSieveStatus(null); | |
| 270 | + List<String> sieveStatusList = new ArrayList<>(); | |
| 271 | + sieveStatusList.add("1"); | |
| 272 | + sieveStatusList.add("2"); | |
| 273 | + sieveStatusList.add("3"); | |
| 274 | + babyModelQuery.setSieveStatusList(sieveStatusList); | |
| 271 | 275 | }else { |
| 272 | 276 | babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus()); |
| 273 | 277 | } |