Commit d190d8dcc928ab54f7ff90ba7e8b5f2c7d01b16e
1 parent
08eda14eca
Exists in
master
and in
1 other branch
孕妇分娩后 变成产妇
Showing 1 changed file with 15 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
View file @
d190d8d
| ... | ... | @@ -79,7 +79,7 @@ |
| 79 | 79 | if (CollectionUtils.isNotEmpty(destList)) { |
| 80 | 80 | List<MatDeliverExt> list = new ArrayList<>(); |
| 81 | 81 | for (MaternalDeliverModel model : destList) { |
| 82 | - list.add(new MatDeliverExt(model,patients.getCreated())); | |
| 82 | + list.add(new MatDeliverExt(model,patients.getCreated(),patients.getBuildType())); | |
| 83 | 83 | } |
| 84 | 84 | setData(list); |
| 85 | 85 | } |
| ... | ... | @@ -177,8 +177,9 @@ |
| 177 | 177 | private String id; |
| 178 | 178 | private String checkTime; |
| 179 | 179 | private String enableEdit = "0"; |
| 180 | - | |
| 181 | - public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime) { | |
| 180 | + //建档类型 0 未分娩建档 1儿童建档时建档 | |
| 181 | + private String dueType; | |
| 182 | + public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime,Integer buildType) { | |
| 182 | 183 | setCheckTime(deliverModel.getDueDate()); |
| 183 | 184 | setId(deliverModel.getId()); |
| 184 | 185 | setHospitalId(deliverModel.getHospitalId()); |
| ... | ... | @@ -187,6 +188,17 @@ |
| 187 | 188 | Date date = DateUtil.parseYMD(deliverModel.getDueDate()); |
| 188 | 189 | setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); |
| 189 | 190 | } |
| 191 | + if(null!=buildType){ | |
| 192 | + dueType=buildType+""; | |
| 193 | + } | |
| 194 | + } | |
| 195 | + | |
| 196 | + public String getDueType() { | |
| 197 | + return dueType; | |
| 198 | + } | |
| 199 | + | |
| 200 | + public void setDueType(String dueType) { | |
| 201 | + this.dueType = dueType; | |
| 190 | 202 | } |
| 191 | 203 | |
| 192 | 204 | public String getEnableEdit() { |