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 6718314..090d61a 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 @@ -5374,7 +5374,7 @@ public class BabyBookbuildingFacade { model.setDoctorId(request.getDoctorId()); model.setContent(request.getContent()); model.setNextCheckTime(DateUtil.parseYMD(request.getNextCheckTime())); - + model.setRecordTime(DateUtil.parseYMD(request.getRecordTime())); if (StringUtils.isNotEmpty(request.getId())) { model.setModified(new Date()); @@ -5384,7 +5384,7 @@ public class BabyBookbuildingFacade { mongoTemplate.updateFirst(query, update, BabyRecordModel.class); } else { - model.setRecordTime(new Date()); + model.setCreated(new Date()); model.setModified(new Date()); model.setHospitalId(autoMatchFacade.getHospitalId(userId)); @@ -5408,6 +5408,7 @@ public class BabyBookbuildingFacade { data.put("motherName", babyModelDb.getMname()); data.put("sex", SexEnum.getTextById(babyModelDb.getSex())); data.put("phone", babyModelDb.getMphone()); + data.put("riskCode", StringUtils.riskCodeStr(babyModelDb.getRiskCode())); String homeAddress = CommonsHelper.getResidence(babyModelDb.getProvinceId(), babyModelDb.getCityId(), babyModelDb.getAreaId(), babyModelDb.getStreetId(), babyModelDb.getAddress(), basicConfigService); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index eca03b9..e18797d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -143,6 +143,7 @@ public class BabyNutritionFacade { Date date = DateUtil.getYmdDate(new Date()); babyCheckQuery.setCheckDateStart(date); babyCheckQuery.setCheckDateEnd(new Date(date.getTime() + 24 * 60 * 60 * 1000 - 1)); + babyCheckQuery.setBuildId(babyId); List babyChecks = babyCheckService.queryBabyCheckRecord(babyCheckQuery); if (CollectionUtils.isNotEmpty(babyChecks)) { @@ -1885,7 +1886,7 @@ public class BabyNutritionFacade { if (null != babyDiet.getShape() && month == 6 && babyDiet.getShape() == 1) { if (StringUtils.isNotEmpty(model.getFeedType())) { - if (Integer.valueOf(model.getFeedType()) == month) { + if (Integer.valueOf(model.getFeedType()) == babyDiet.getFeedingPattern()) { data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); } } else { @@ -1934,7 +1935,15 @@ public class BabyNutritionFacade { if (month == 6) { if (StringUtils.isNotEmpty(model.getFeedType())) { if (babyDiet.getFeedingPattern() == Integer.valueOf(model.getFeedType())) { - data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); + if (kaupEvaluate.equals("消瘦") && babyDiet.getShape() == 0) + { + data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); + } + else if (kaupEvaluate.equals("超重") && babyDiet.getShape() == 2) + { + data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); + } + } } } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyRecordRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyRecordRequest.java index 5aa755a..fd67a0b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyRecordRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyRecordRequest.java @@ -10,6 +10,15 @@ public class BabyRecordRequest { private String nextCheckTime; private String content; private String babyId; + private String recordTime; + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } public String getBabyId() { return babyId;