diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 48a6e0d..e2614d5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2818,6 +2818,12 @@ public class BabyBookbuildingFacade { }else{ result.setHasChkRecord(false); } + result.setChkCnt(checkModels.size()); +// for (int i = 0; i < checkModels.size(); i++) { +// if(checkModels.get(i).getId().equals(result.getId())){ +// result.setChkCnt(i+1); +// } +// } } BaseListResponse objectResponse = new BaseListResponse(); 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 e27fcef..f310383 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 @@ -1391,6 +1391,16 @@ public class BabyCheckFacade extends BaseServiceImpl { } map.put("height", babyCheckModel.getHeight()); map.put("weight", babyCheckModel.getWeight()); + + List ckLst=mongoTemplate.find(Query.query(Criteria.where("buildId").is(babyCheckModel.getBuildId()).and("yn").is(YnEnums.YES.getId())).with(new Sort(Sort.Direction.ASC, "created")), BabyCheckModel.class); + for (int i = 0; i < ckLst.size(); i++) { + if(ckLst.get(i).getId().equals(babyCheckModel.getId())){ + map.put("chkCnt",i+1); + } + } + + map.put("birth",DateUtil.getyyyy_MM_dd(babyCheckModel.getBirth())); + list.add(map); } pageResult.setGrid(list); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index 5766f4f..ea885bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -107,6 +107,17 @@ public class BabyManageListResult { // 是否有检查记录 private boolean hasChkRecord; + + private Integer chkCnt;//就诊次数 + + public Integer getChkCnt() { + return chkCnt; + } + + public void setChkCnt(Integer chkCnt) { + this.chkCnt = chkCnt; + } + public boolean isHasChkRecord() { return hasChkRecord; }