jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 4e5b1223ee29427c48af82b51e78a5c40df886f5

Authored by dongqin
2 parents bac5881921 74556b9349
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-dal/pom.xml View file @ 4e5b122
... ... @@ -25,7 +25,7 @@
25 25 <dependency>
26 26 <groupId>org.projectlombok</groupId>
27 27 <artifactId>lombok</artifactId>
28   - <version>1.18.8</version>
  28 + <version>1.16.16</version>
29 29 <scope>provided</scope>
30 30 </dependency>
31 31 </dependencies>
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 4e5b122
... ... @@ -1164,7 +1164,7 @@
1164 1164 if (null != c) {
1165 1165 c.and("mbirth").lte(startAge).gte(endAge);
1166 1166 } else {
1167   - c = Criteria.where("mbirth").lte(startAge);
  1167 + c = Criteria.where("mbirth").lte(startAge).gte(endAge);
1168 1168 }
1169 1169 }
1170 1170  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 4e5b122
... ... @@ -2511,6 +2511,9 @@
2511 2511 babyModelQuery.setAsphyxiaMEnd(newBabyManagerRequest.getAsphyxiaMEnd());
2512 2512 }
2513 2513 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
  2514 +
  2515 +
  2516 +
2514 2517 if (CollectionUtils.isEmpty(babyModelList)) {
2515 2518 newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());
2516 2519 newBabyManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);