jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a8a28823f7a673dc7b59b100a147c0a3fd9f08f6

Authored by shiyang
1 parent 738aa44d12
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 2 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java View file @ a8a2882
... ... @@ -315,7 +315,7 @@
315 315 Map<String, Object> temp = new LinkedHashMap<>();
316 316 temp.put("id", patientWeight.getId());
317 317 temp.put("userName", temporaryUser.getUserName());
318   - temp.put("age", DateUtil.getAge(temporaryUser.getBirth()));
  318 + temp.put("age", null!=DateUtil.getAge(temporaryUser.getBirth())?DateUtil.getAge(temporaryUser.getBirth()):"");
319 319 temp.put("phone", temporaryUser.getPhone());
320 320 //末次月经
321 321 Date dueDate = DateUtil.addDay(temporaryUser.getLastMenses(), 280);
... ... @@ -450,7 +450,7 @@
450 450 //末次月经
451 451 Date dueDate = DateUtil.addDay(temporaryUser.getLastMenses(), 280);
452 452 map.put("dueDate",DateUtil.getyyyy_MM_dd(dueDate));
453   - map.put("age", DateUtil.getAge(temporaryUser.getBirth()) + " 岁");
  453 + map.put("age", null!=DateUtil.getAge(temporaryUser.getBirth())?DateUtil.getAge(temporaryUser.getBirth()):"");
454 454 week = DateUtil.getWeek2(temporaryUser.getLastMenses(), new Date());
455 455 String yunqi = "孕" + String.valueOf(week) + "周";
456 456 map.put("yunqi", yunqi);