diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 93407ce..59aedca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -152,7 +152,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP report.setStatus(0); report.setType(bpCountType+countType); - report.setGuide(bp.getInfos().size()>=5?typeGuideMap.get(report.getType()):"在这周你的血压测量次数没有达到可以达到出报告的标准,但是根据你的孕周这份报告可以给你提供相应的膳食指导。"); + report.setGuide(bp.getInfos().size()>=5?typeGuideMap.get(report.getType()):"在这周你的血压测量次数没有达到可以出报告的标准,但是根据你的孕周这份报告可以给你提供相应的膳食指导。"); report.setBpWaveCount(String.valueOf(bpcount)); report.setBpValExp(String.valueOf(count)); report.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 6db0479..79a4dc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -682,6 +682,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga BloodSugarConfigModel medicineModel = mongoTemplate.findOne(Query.query(Criteria.where("type").is(3).and("week").is(String.valueOf(week))), BloodSugarConfigModel.class); medicineData.put("medicineList",medicineModel.getWeekContents()); medicineData.put("medicineList1", medicineModel.getWeekContentsTwo()); + }else{ + medicineData.put("medicineList1","请随时注意血糖变化情况,如出现异常及时就医,遵医嘱调整治疗方案。"); } reusltMap.put("medicineData",medicineData); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 173d5b7..fd1a215 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -488,7 +488,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("age", DateUtil.getAge(patients.getBirth()) + " 岁"); week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); String yunqi = "孕" + String.valueOf(week) + "周"; - map.put("yunqi", yunqi); + map.put("yunqi", "孕周"); List factor = patients.getRiskFactorId(); String risk = ""; if (CollectionUtils.isNotEmpty(factor)) { @@ -509,7 +509,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } map.put("risk", risk); } - map.put("height", patientWeight.getBeforeHeight() == null ? "" : MathUtil.doubleFormat(Double.parseDouble(patientWeight.getBeforeHeight()) / 100) + " 米"); + //map.put("height", patientWeight.getBeforeHeight() == null ? "" : MathUtil.doubleFormat(Double.parseDouble(patientWeight.getBeforeHeight()) / 100) + " 米"); + map.put("height", patientWeight.getBeforeHeight() == null ? "" : patientWeight.getBeforeHeight()+"cm"); map.put("beforeWeight", patientWeight.getBeforeWeight() == null ? "" : patientWeight.getBeforeWeight() + " 公斤"); map.put("bmi", patientWeight.getBmi()); map.put("nowWeight", patientWeight.getNowWeight() + " 公斤"); @@ -856,10 +857,10 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient Map map2 = setData2("每日摄入3次奶及奶制品", "每日保证摄入3杯牛奶,约500ml;经常摄入酸奶、芝士、排骨、鱼虾类以达到钙质的补充。"); Map map3 = setData2("肉类、鱼虾类、蔬菜、水果均衡摄入", "每日保证至少300g蔬菜和200g水果的摄入,可根据自己的喜好选择2-3种时令水果和蔬菜;随着孕期的变化每日100-300g肉类和1-3个鸡蛋的摄入;每周2-3次豆类的摄入(每次20-30g)和2-3次鱼虾类的摄入(每次100-200g),以及1次动物内脏的摄入(每次50-100g)。"); Map map4 = setData2("增加用餐次数", "应采取少食多餐的原则,每日进餐次数由孕前的3次增加至5-6次,每日可在3次正餐中间加2-3次的加餐,每餐时间间隔约2小时左右,每餐8-9分饱即可。"); - Map map5 = setData2("保证饮食的清淡", "每日食盐的摄入不得超过5g,烹调时减少酱油、味精、糖等调料的添加;减少油脂的摄入,保证饮食的清淡,少吃或不吃油炸食物、辛辣食物、糕点、饮料、冰淇淋等"); + Map map5 = setData2("保证饮食的清淡", "每日食盐的摄入不得超过5g,烹调时减少酱油、味精、糖等调料的添加;减少油脂的摄入,保证饮食的清淡,少吃或不吃油炸食物、辛辣食物、糕点、饮料、冰淇淋等。"); Map map6 = setData2("保证食物的清洁卫生", "保证食物的卫生,新鲜,不吃隔夜、变质的食物,不吃没有熟透的肉类和海鲜,尽量减少外出用餐。"); - Map map7 = setData2("远离烟、酒、咖啡因,保证水分的充足", "孕期绝对禁止抽烟、饮酒;减少咖啡因的摄入,每日不得超过300mg,少喝咖啡,不喝浓茶、碳酸饮料等,保证每日2300ml水的摄入"); - Map map8 = setData2("规律的生活,适当的运动", "养成规律的睡眠习惯,早睡——11点以前入睡,避免熬夜,早期——7:30-8:00间起床吃早餐,以免晚上失眠;每天根据自己的情况保证20-40分钟的轻度运动,孕早期以散步为宜,中期以游泳、瑜伽为宜,孕晚期以散步、助产运动为宜。"); + Map map7 = setData2("远离烟、酒、咖啡因,保证水分的充足", "孕期绝对禁止抽烟、饮酒;减少咖啡因的摄入,每日不得超过300mg,少喝咖啡,不喝浓茶、碳酸饮料等,保证每日2300ml水的摄入。"); + Map map8 = setData2("规律的生活,适当的运动", "养成规律的睡眠习惯,早睡——11点以前入睡,避免熬夜,早起——7:30-8:00间起床吃早餐,以免晚上失眠;每天根据自己的情况保证20-40分钟的轻度运动,孕早期以散步为宜,中期以游泳、瑜伽为宜,孕晚期以散步、助产运动为宜。"); WeightConfigModel configModel = getWeightConfigByWeek(week); Map map9 = setData2("本周需注意", configModel != null ? configModel.getWeekContent() : "");