diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java index df58868..b8ec15a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java @@ -10,7 +10,7 @@ import java.util.*; /** * 孕产妇体重管理 */ -@Document(collection="lyms_patient_weight") +@Document(collection = "lyms_patient_weight") public class PatientWeight extends BaseModel { @Transient @@ -152,18 +152,6 @@ public class PatientWeight extends BaseModel { this.printingTime = printingTime; } - //打印时间 - private Date printingTime; - - - public Date getPrintingTime() { - return printingTime; - } - - public void setPrintingTime(Date printingTime) { - this.printingTime = printingTime; - } - public Integer getExceptionSend() { return exceptionSend; } 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 c445762..97d5585 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 @@ -804,6 +804,7 @@ public class BabyCheckFacade extends BaseServiceImpl { Map map = new HashMap<>(); if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) { BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class); + map.put("id", babyModel.getId()); map.put("babyName", babyModel.getName()); map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); map.put("mName", babyModel.getMname()); @@ -2369,7 +2370,7 @@ public class BabyCheckFacade extends BaseServiceImpl { //kaul = getKaul(kaul); int k = (int) (kaul / 100) * 100; - kaul = (double)k; + kaul = (double) k; if (kaul < 800) { kaul = 800D; 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 772c84a..e04bcad 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 @@ -1314,7 +1314,6 @@ public class BabyNutritionFacade { //身高评价 String heightEvaluate = babyCheckFacade.getGrowthValue1(DateUtil.getyyyy_MM_dd(baby.getBirth()), model.getHeight(), baby.getSex(), 1, null, DateUtil.getyyyy_MM_dd(baby.getCreated())); map.put("heightEvaluate", heightEvaluate); - int month = DateUtil.getMonth(baby.getBirth(), model.getNutritiTime()); if (month > 36) { return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("月龄范围没有报告"); @@ -1346,7 +1345,8 @@ public class BabyNutritionFacade { } else if (kaupEvaluate.equals("正常") && month >= 6 && month <= 11) { List babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month)), BabyDietReportModel.class); for (BabyDietReportModel babyDiet : babyDietReportList) { - if (month == 6 && babyDiet.getShape() == 1) { + + if (null != babyDiet.getShape() && month == 6 && babyDiet.getShape() == 1) { if (StringUtils.isNotEmpty(model.getFeedType())) { if (Integer.valueOf(model.getFeedType()) == month) { data.put("feedingGuide", babyDiet.getFeedingGuide());