Commit 7f98b76662a24090a530db81e625419dc2402971
1 parent
052c94932c
Exists in
master
and in
6 other branches
临时血压修改
Showing 2 changed files with 13 additions and 1 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
7f98b76
... | ... | @@ -1735,6 +1735,11 @@ |
1735 | 1735 | } |
1736 | 1736 | |
1737 | 1737 | public static void main(String[] args) { |
1738 | + | |
1739 | + Date startDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd( DateUtil.addDay(new Date(), -3)) + " 00:00:00"); | |
1740 | + Date endDate = DateUtil.addDay(new Date(), 1); | |
1741 | + System.out.println(getyyyy_MM_dd_hms(startDate)); | |
1742 | + System.out.println(getyyyy_MM_dd_hms(endDate)); | |
1738 | 1743 | // |
1739 | 1744 | // Date bir = parseYMD("2021-05-29"); |
1740 | 1745 | // int i = DateUtil.getBabyAgeMonth(bir, new Date()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java
View file @
7f98b76
... | ... | @@ -292,10 +292,17 @@ |
292 | 292 | paMap.put("username", temporaryUser.getUserName()); |
293 | 293 | paMap.put("phone", temporaryUser.getPhone()); |
294 | 294 | paMap.put("age", DateUtil.getAge(temporaryUser.getBirth())); |
295 | - //paMap.put("dueDate", DateUtil.getyyyy_MM_dd(bloodModel.getDueDate())); | |
295 | + paMap.put("dueDate", DateUtil.getyyyy_MM_dd(DateUtil.addDay(DateUtil.addMonth(temporaryUser.getLastMenses(),9),7))); | |
296 | 296 | paMap.put("height", temporaryUser.getBeforeHeight()); |
297 | 297 | paMap.put("beforWeight", temporaryUser.getBeforeWeight()); |
298 | 298 | paMap.put("weeks", weeks); |
299 | + | |
300 | + paMap.put("pulse", temporaryBloo.getPulse()); | |
301 | + paMap.put("ssy", temporaryBloo.getSsy()); | |
302 | + paMap.put("szy", temporaryBloo.getSzy()); | |
303 | + paMap.put("checkDate", DateUtil.getyyyy_MM_dd(temporaryBloo.getCreated())); | |
304 | + | |
305 | + | |
299 | 306 | datas.put("userInfo", paMap); |
300 | 307 | Double bmiD = Double.valueOf(patientWeightService.getBmi(weight, height)).doubleValue(); |
301 | 308 | String bmiStr = ""; |