diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index 3943b04..389bbca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -227,7 +227,10 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } } temp.put("riskFactor", rFactor); // 高危因素 - // temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); + Calendar rightNow = Calendar.getInstance(); + rightNow.setTime(bloodPressure.getLastMenses()); + rightNow.add(Calendar.DAY_OF_YEAR, 280); + temp.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg"); temp.put("pulse", bloodPressure.getPulse()); temp.put("status", getPulseStatus(bloodPressure.getSsy(), bloodPressure.getSzy())); @@ -238,7 +241,6 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight()); temp.put("height", bloodPressure.getBeforeHeight() == null ? "" : bloodPressure.getBeforeHeight()); temp.put("bregmatic", bloodPressure.getBregmatic() == null ? "" : bloodPressure.getBregmatic()); - } restList.add(temp); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java index 872bb54..9526688 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java @@ -236,6 +236,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo temp.put("number", patientWeight.getNumber()); temp.put("created", DateUtil.getyyyy_MM_dd(patientWeight.getModified())); temp.put("doctorName", patientWeight.getDoctorName()); + temp.put("bregmatic", patientWeight.getBregmatic()); restMap.add(temp); } } @@ -336,7 +337,10 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo //map.put("vcCard", patients.getVcCardNo()); map.put("username", template.getUserName()); map.put("phone", template.getPhone()); - //map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); + Calendar rightNow = Calendar.getInstance(); + rightNow.setTime(template.getLastMenses()); + rightNow.add(Calendar.DAY_OF_YEAR, 280); + map.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); map.put("age", template.getAge() + " 岁"); week = DateUtil.getWeek2(template.getLastMenses(), new Date()); String yunqi = "孕" + String.valueOf(week) + "周"; @@ -769,7 +773,10 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo userMap.put("week", "孕" + week + "周"); //userMap.put("vcCardNo", patients.getVcCardNo()); userMap.put("phone", model.getPhone()); - //userMap.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); + Calendar rightNow = Calendar.getInstance(); + rightNow.setTime(model.getLastMenses()); + rightNow.add(Calendar.DAY_OF_YEAR, 280); + userMap.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); userMap.put("NowWeight", model.getNowWeight() + "kg"); userMap.put("BeforeWeight", model.getBeforeWeight() + "kg"); //userMap.put("riskFactor", set); @@ -832,7 +839,10 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo userMap.put("week", "孕" + week + "周"); // userMap.put("vcCardNo", patients.getVcCardNo()); userMap.put("phone", model.getPhone()); - // userMap.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); + Calendar rightNow = Calendar.getInstance(); + rightNow.setTime(model.getLastMenses()); + rightNow.add(Calendar.DAY_OF_YEAR, 280); + userMap.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); userMap.put("NowWeight", model.getNowWeight() + "kg"); userMap.put("BeforeWeight", model.getBeforeWeight() + "kg");