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 9eaeec7..89930ae 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 @@ -215,13 +215,14 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if(patientWeight != null) { Map map = new HashMap<>(); Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); + Integer week = null; if(patients != null) { map.put("vcCard", patients.getVcCardNo()); map.put("username", patients.getUsername()); map.put("phone", patients.getPhone()); map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("age", DateUtil.getAge(patients.getBirth())); - Integer week = DateUtil.getWeek(patients.getLastMenses(), new Date()) - 1; + week = DateUtil.getWeek(patients.getLastMenses(), new Date()); String yunqi = ""; if(week <= 12) { yunqi = "孕早期"; @@ -237,7 +238,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("bmi", patientWeight.getBmi()); map.put("nowWeight", patientWeight.getNowWeight()); map.put("pregnancy", DateUtil.getWeekDesc(patients.getLastMenses(), new Date())); - Integer week = DateUtil.getWeek(patients.getLastMenses(), new Date()); if(week != null) { week = week - 1; //他们写的计算周的方法有问题 会多一周 setInfo(week, map); // 设置孕期相关营养信息