diff --git a/platform-dal/pom.xml b/platform-dal/pom.xml
index 82aa12e..20d8c88 100644
--- a/platform-dal/pom.xml
+++ b/platform-dal/pom.xml
@@ -25,7 +25,7 @@
org.projectlombok
lombok
- 1.18.8
+ 1.16.16
provided
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 e43a68d..4c3d1fc 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
@@ -1164,7 +1164,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
if (null != c) {
c.and("mbirth").lte(startAge).gte(endAge);
} else {
- c = Criteria.where("mbirth").lte(startAge);
+ c = Criteria.where("mbirth").lte(startAge).gte(endAge);
}
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index c44ef57..2f3bd7c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -2511,6 +2511,9 @@ public class MatDeliverFacade {
babyModelQuery.setAsphyxiaMEnd(newBabyManagerRequest.getAsphyxiaMEnd());
}
List babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
+
+
+
if (CollectionUtils.isEmpty(babyModelList)) {
newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());
newBabyManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);