diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java index bd04e5b..05a38b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java @@ -224,17 +224,20 @@ public class MicroelementFacade { Date lastMenses = DateUtil.addDay(pat.getLastMenses(),1); int week = DateUtil.getWeek(lastMenses,model.getCreated()); Map> contents = new HashMap<>(); - boolean isNormal = false; + boolean isNormal = true; if (CollectionUtils.isNotEmpty(model.getMicroelements())) { for (MicroelementModel.Microelement ele : model.getMicroelements()) { - if (2 == ele.getStatus() || "铅".equals(ele.getEleName())) + if ("铅".equals(ele.getEleName())) { - isNormal = true; continue; } + if (2 != ele.getStatus() ) + { + isNormal = false; + } MicroelementConfigModel configModel = mongoTemplate.findOne( Query.query(Criteria.where("eleName").is(ele.getEleName()).and("status").is(ele.getStatus()).and("type").is(0)), MicroelementConfigModel.class); @@ -316,17 +319,20 @@ public class MicroelementFacade { data.put("microelements", model.getMicroelements()); data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); Map> contents = new HashMap<>(); - boolean isNormal = false; + boolean isNormal = true; int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),model.getCreated()); if (CollectionUtils.isNotEmpty(model.getMicroelements())) { for (MicroelementModel.Microelement ele : model.getMicroelements()) { - if (2 == ele.getStatus() || "铅".equals(ele.getEleName())) + if ("铅".equals(ele.getEleName())) { - isNormal = true; continue; } + if (2 != ele.getStatus() ) + { + isNormal = false; + } Query query1 = Query.query(Criteria.where("eleName").is(ele.getEleName()).and("status").is(ele.getStatus()).and("type").is(1)); List configModels = mongoTemplate.find(query1 , MicroelementConfigModel.class);