Commit 32a8ce7a713c688a62c3cf2e25d85320438e89d7
1 parent
309b9dd399
Exists in
master
and in
8 other branches
增加设置parentid
Showing 1 changed file with 16 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
View file @
32a8ce7
| ... | ... | @@ -46,9 +46,18 @@ |
| 46 | 46 | |
| 47 | 47 | // 胎数 |
| 48 | 48 | private String tireNumber1; |
| 49 | + private String status="0"; | |
| 49 | 50 | |
| 50 | 51 | private List data = new ArrayList(); |
| 51 | 52 | |
| 53 | + public String getStatus() { | |
| 54 | + return status; | |
| 55 | + } | |
| 56 | + | |
| 57 | + public void setStatus(String status) { | |
| 58 | + this.status = status; | |
| 59 | + } | |
| 60 | + | |
| 52 | 61 | public String getDueType() { |
| 53 | 62 | return dueType; |
| 54 | 63 | } |
| 55 | 64 | |
| 56 | 65 | |
| ... | ... | @@ -85,16 +94,19 @@ |
| 85 | 94 | setName(patients.getUsername()); |
| 86 | 95 | setPhone(patients.getPhone()); |
| 87 | 96 | setRemarks(patients.getMremark()); |
| 88 | - setRiskScore("60"); | |
| 89 | - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 90 | - String week = (days / 7) + ""; | |
| 91 | - int day = (days % 7); | |
| 92 | 97 | |
| 98 | + if(null != patients.getFmDate()){ | |
| 99 | + status="1"; | |
| 100 | + } | |
| 101 | + | |
| 93 | 102 | if (patients.getDueStatus() == 1) { |
| 94 | 103 | this.dueWeek = "终止妊娠"; |
| 95 | 104 | } else if (null != patients.getFmDate()) { |
| 96 | 105 | dueWeek = "已分娩"; |
| 97 | 106 | } else { |
| 107 | + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 108 | + String week = (days / 7) + ""; | |
| 109 | + int day = (days % 7); | |
| 98 | 110 | this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); |
| 99 | 111 | } |
| 100 | 112 | if (CollectionUtils.isNotEmpty(destList)) { |