Commit d9239f08c69f6262e8704f7843fd1e35108e088e
1 parent
a8990daf83
Exists in
master
and in
6 other branches
自测bug提交
Showing 2 changed files with 17 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java
View file @
d9239f0
| ... | ... | @@ -227,7 +227,10 @@ |
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | temp.put("riskFactor", rFactor); // 高危因素 |
| 230 | - // temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); | |
| 230 | + Calendar rightNow = Calendar.getInstance(); | |
| 231 | + rightNow.setTime(bloodPressure.getLastMenses()); | |
| 232 | + rightNow.add(Calendar.DAY_OF_YEAR, 280); | |
| 233 | + temp.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); | |
| 231 | 234 | temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg"); |
| 232 | 235 | temp.put("pulse", bloodPressure.getPulse()); |
| 233 | 236 | temp.put("status", getPulseStatus(bloodPressure.getSsy(), bloodPressure.getSzy())); |
| ... | ... | @@ -238,7 +241,6 @@ |
| 238 | 241 | temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight()); |
| 239 | 242 | temp.put("height", bloodPressure.getBeforeHeight() == null ? "" : bloodPressure.getBeforeHeight()); |
| 240 | 243 | temp.put("bregmatic", bloodPressure.getBregmatic() == null ? "" : bloodPressure.getBregmatic()); |
| 241 | - | |
| 242 | 244 | } |
| 243 | 245 | restList.add(temp); |
| 244 | 246 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
View file @
d9239f0
| ... | ... | @@ -236,6 +236,7 @@ |
| 236 | 236 | temp.put("number", patientWeight.getNumber()); |
| 237 | 237 | temp.put("created", DateUtil.getyyyy_MM_dd(patientWeight.getModified())); |
| 238 | 238 | temp.put("doctorName", patientWeight.getDoctorName()); |
| 239 | + temp.put("bregmatic", patientWeight.getBregmatic()); | |
| 239 | 240 | restMap.add(temp); |
| 240 | 241 | } |
| 241 | 242 | } |
| ... | ... | @@ -336,7 +337,10 @@ |
| 336 | 337 | //map.put("vcCard", patients.getVcCardNo()); |
| 337 | 338 | map.put("username", template.getUserName()); |
| 338 | 339 | map.put("phone", template.getPhone()); |
| 339 | - //map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 340 | + Calendar rightNow = Calendar.getInstance(); | |
| 341 | + rightNow.setTime(template.getLastMenses()); | |
| 342 | + rightNow.add(Calendar.DAY_OF_YEAR, 280); | |
| 343 | + map.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); | |
| 340 | 344 | map.put("age", template.getAge() + " 岁"); |
| 341 | 345 | week = DateUtil.getWeek2(template.getLastMenses(), new Date()); |
| 342 | 346 | String yunqi = "孕" + String.valueOf(week) + "周"; |
| ... | ... | @@ -769,7 +773,10 @@ |
| 769 | 773 | userMap.put("week", "孕" + week + "周"); |
| 770 | 774 | //userMap.put("vcCardNo", patients.getVcCardNo()); |
| 771 | 775 | userMap.put("phone", model.getPhone()); |
| 772 | - //userMap.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 776 | + Calendar rightNow = Calendar.getInstance(); | |
| 777 | + rightNow.setTime(model.getLastMenses()); | |
| 778 | + rightNow.add(Calendar.DAY_OF_YEAR, 280); | |
| 779 | + userMap.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); | |
| 773 | 780 | userMap.put("NowWeight", model.getNowWeight() + "kg"); |
| 774 | 781 | userMap.put("BeforeWeight", model.getBeforeWeight() + "kg"); |
| 775 | 782 | //userMap.put("riskFactor", set); |
| ... | ... | @@ -832,7 +839,10 @@ |
| 832 | 839 | userMap.put("week", "孕" + week + "周"); |
| 833 | 840 | // userMap.put("vcCardNo", patients.getVcCardNo()); |
| 834 | 841 | userMap.put("phone", model.getPhone()); |
| 835 | - // userMap.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 842 | + Calendar rightNow = Calendar.getInstance(); | |
| 843 | + rightNow.setTime(model.getLastMenses()); | |
| 844 | + rightNow.add(Calendar.DAY_OF_YEAR, 280); | |
| 845 | + userMap.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); | |
| 836 | 846 | userMap.put("NowWeight", model.getNowWeight() + "kg"); |
| 837 | 847 | userMap.put("BeforeWeight", model.getBeforeWeight() + "kg"); |
| 838 | 848 |