Commit a525e59cad633c3e165d395b8c53f32133e41f36
1 parent
c19544b03c
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 5 additions and 9 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java
View file @
a525e59
| ... | ... | @@ -257,9 +257,9 @@ |
| 257 | 257 | } |
| 258 | 258 | if(null!=birthEnd){ |
| 259 | 259 | if(null != c){ |
| 260 | - c = c.where("birth").gte(birthEnd); | |
| 260 | + c = c.where("birth").lte(birthEnd); | |
| 261 | 261 | }else{ |
| 262 | - c = Criteria.where("birth").gte(birthEnd); | |
| 262 | + c = Criteria.where("birth").lte(birthEnd); | |
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 | if (null != oralCheckTimeStart && oralCheckTimeEnd != null) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java
View file @
a525e59
| ... | ... | @@ -219,12 +219,11 @@ |
| 219 | 219 | request.setNextOralCheckTimeEnd(DateUtil.getDayLastSecond(request.getNextOralCheckTimeEnd())); |
| 220 | 220 | } |
| 221 | 221 | //当前月龄筛选 |
| 222 | - if(request.getQueryMonthAgeStart()!=null){ | |
| 222 | + if(request.getQueryMonthAgeStart()!=null && request.getQueryMonthAgeEnd()!=null){ | |
| 223 | 223 | request.setBirthStart(DateUtil.getBirthStart(request.getQueryMonthAgeEnd())); |
| 224 | - } | |
| 225 | - if(request.getQueryMonthAgeEnd()!=null){ | |
| 226 | 224 | request.setBirthEnd(DateUtil.getBirthEnd(request.getQueryMonthAgeStart())); |
| 227 | 225 | } |
| 226 | + System.out.println(request.convertToQuery().convertToMongoQuery().toString()); | |
| 228 | 227 | List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,"created"); |
| 229 | 228 | List<Map> result=new ArrayList<>(); |
| 230 | 229 | for (BabyOralCheck babyOralCheck : babyOralChecks) { |
| 231 | 230 | |
| 232 | 231 | |
| ... | ... | @@ -254,14 +253,11 @@ |
| 254 | 253 | babyModelQuery.setNextOralCheckTimeEnd(DateUtil.getDayLastSecond(babyModelQuery.getNextOralCheckTimeEnd())); |
| 255 | 254 | } |
| 256 | 255 | //当前月龄筛选 |
| 257 | - if(babyModelQuery.getQueryMonthAgeStart()!=null){ | |
| 256 | + if(babyModelQuery.getQueryMonthAgeStart()!=null && babyModelQuery.getQueryMonthAgeEnd()!=null){ | |
| 258 | 257 | babyModelQuery.setBirthStart(DateUtil.getBirthStart(babyModelQuery.getQueryMonthAgeEnd())); |
| 259 | - } | |
| 260 | - if(babyModelQuery.getQueryMonthAgeEnd()!=null){ | |
| 261 | 258 | babyModelQuery.setBirthEnd(DateUtil.getBirthEnd(babyModelQuery.getQueryMonthAgeStart())); |
| 262 | 259 | } |
| 263 | 260 | List<BabyModel> babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "oralCheckTime", Sort.Direction.DESC); |
| 264 | - System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 265 | 261 | List<Map> result=new ArrayList<>(); |
| 266 | 262 | for (BabyModel babyModel : babyModelList) { |
| 267 | 263 | Map<String,Object> map=new HashMap<>(); |