Commit 309b9dd39979c866dfe1262504be7c9c0b731a43
1 parent
e84e49e8b4
Exists in
master
and in
8 other branches
增加设置parentid
Showing 1 changed file with 15 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
View file @
309b9dd
| ... | ... | @@ -79,8 +79,8 @@ |
| 79 | 79 | if (null != patients.getDueDate()) { |
| 80 | 80 | setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
| 81 | 81 | } |
| 82 | - if(null!=patients.getBuildType()){ | |
| 83 | - dueType=0==patients.getBuildType()?"0":"1"; | |
| 82 | + if (null != patients.getBuildType()) { | |
| 83 | + dueType = 0 == patients.getBuildType() ? "0" : "1"; | |
| 84 | 84 | } |
| 85 | 85 | setName(patients.getUsername()); |
| 86 | 86 | setPhone(patients.getPhone()); |
| 87 | 87 | |
| ... | ... | @@ -89,11 +89,18 @@ |
| 89 | 89 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |
| 90 | 90 | String week = (days / 7) + ""; |
| 91 | 91 | int day = (days % 7); |
| 92 | - this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 92 | + | |
| 93 | + if (patients.getDueStatus() == 1) { | |
| 94 | + this.dueWeek = "终止妊娠"; | |
| 95 | + } else if (null != patients.getFmDate()) { | |
| 96 | + dueWeek = "已分娩"; | |
| 97 | + } else { | |
| 98 | + this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 99 | + } | |
| 93 | 100 | if (CollectionUtils.isNotEmpty(destList)) { |
| 94 | 101 | List<MatDeliverExt> list = new ArrayList<>(); |
| 95 | 102 | for (MaternalDeliverModel model : destList) { |
| 96 | - list.add(new MatDeliverExt(model,patients.getCreated(),patients.getBuildType(),patients.getFmDate())); | |
| 103 | + list.add(new MatDeliverExt(model, patients.getCreated(), patients.getBuildType(), patients.getFmDate())); | |
| 97 | 104 | } |
| 98 | 105 | setData(list); |
| 99 | 106 | } |
| ... | ... | @@ -194,7 +201,8 @@ |
| 194 | 201 | |
| 195 | 202 | //分娩时间，补录时使用 |
| 196 | 203 | private String dueDate; |
| 197 | - public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime,Integer buildType,Date dueDate) { | |
| 204 | + | |
| 205 | + public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime, Integer buildType, Date dueDate) { | |
| 198 | 206 | setCheckTime(deliverModel.getDueDate()); |
| 199 | 207 | setId(deliverModel.getId()); |
| 200 | 208 | setHospitalId(deliverModel.getHospitalId()); |
| ... | ... | @@ -204,8 +212,8 @@ |
| 204 | 212 | setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); |
| 205 | 213 | } |
| 206 | 214 | |
| 207 | - if(null!=dueDate){ | |
| 208 | - this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); | |
| 215 | + if (null != dueDate) { | |
| 216 | + this.dueDate = DateUtil.getyyyy_MM_dd(dueDate); | |
| 209 | 217 | } |
| 210 | 218 | } |
| 211 | 219 |