From 7b0edfe05c36e1db4a062426e6eacd9b029beaec Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 2 Aug 2017 13:41:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E7=9B=B8=E5=85=B3bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/common/enums/BregmaticEnums.java | 6 ++++-- .../lyms/platform/operate/web/service/impl/NewbornServiceImpl.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java index 25ad606..f8979bf 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java @@ -7,8 +7,10 @@ import com.lyms.platform.common.utils.StringUtils; * Created by lt on 2017/7/18 0018 */ public enum BregmaticEnums { - NORMAL(1, "闭合"), - BOMBE(2, "未闭合"); + NORMAL(1, "正常"), + BOMBE(2, "膨隆"), + Sunken(3, "凹陷"), + OTHER(4, "其他"); private Integer id; private String name; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index 8fb447a..4d34610 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -177,12 +177,12 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit Criteria c = new Criteria(); c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); List babyModels = mongoUtil.findField(BabyModel.class, c, "id"); - if(CollectionUtils.isNotEmpty(babyModels)) { +// if(CollectionUtils.isNotEmpty(babyModels)) { List babyIds = CollectionUtils.getId(babyModels, "id", String.class); criteria.and("babyId").in(babyIds); - } +// } } - PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria), page, limit); + PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit); List newbornVisits = (List) pageResult.getGrid(); List> restMap = new ArrayList<>(); for (NewbornVisit visit : newbornVisits) { -- 1.8.3.1