Commit f15be8ab2ad4d37f88cbfd576a58b9ac22ffc82c
1 parent
352bc7b0bf
Exists in
master
and in
1 other branch
1
Showing 1 changed file with 6 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
View file @
f15be8a
| ... | ... | @@ -7,6 +7,7 @@ |
| 7 | 7 | import org.apache.commons.collections.CollectionUtils; |
| 8 | 8 | |
| 9 | 9 | import java.util.ArrayList; |
| 10 | +import java.util.Date; | |
| 10 | 11 | import java.util.List; |
| 11 | 12 | |
| 12 | 13 | /** |
| 13 | 14 | |
| ... | ... | @@ -51,9 +52,12 @@ |
| 51 | 52 | } |
| 52 | 53 | setName(patients.getUsername()); |
| 53 | 54 | setPhone(patients.getPhone()); |
| 54 | - setRemarks("产妇备注"); | |
| 55 | + setRemarks(patients.getMremark()); | |
| 55 | 56 | setRiskScore("60"); |
| 56 | - setDueWeek(""); | |
| 57 | + int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); | |
| 58 | + String week= (days/7)+""; | |
| 59 | + int day = (days%7); | |
| 60 | + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); | |
| 57 | 61 | if(CollectionUtils.isNotEmpty(destList)){ |
| 58 | 62 | List<MatDeliverExt> list = new ArrayList<>(); |
| 59 | 63 | for(MaternalDeliverModel model:destList){ |