diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 5fe04e9..0419925 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1760,7 +1760,8 @@ public class BabyCheckFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); - List babyCheckList = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC); +// List babyCheckList = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC); + List babyCheckList = babyCheckService.queryBabyCheckRecord(query); List babyModels = new ArrayList<>(); if (CollectionUtils.isNotEmpty(babyCheckList)) { 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 cfc62fc..932b900 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 @@ -2203,7 +2203,8 @@ public class MatDeliverFacade { public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest) { NewBabyManagerResult newBabyManagerResult = new NewBabyManagerResult(); BabyModelQuery babyModelQuery = new BabyModelQuery(); - babyModelQuery.setYn(YnEnums.YES.getId()); + //babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setDataStatus(false); babyModelQuery.setQueryNo(StringUtils.isEmpty(newBabyManagerRequest.getQueryNo()) ? null : newBabyManagerRequest.getQueryNo()); if (StringUtils.isNotEmpty(newBabyManagerRequest.getBirthDate())) { try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 8d1e50d..8f126ea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -190,6 +190,72 @@ public class AntExAddRequest implements IBasicRequestConvert mHighRiskReason; public String getLisCheckItems() {