Commit c7fa086671859287f3cc9ec6501f1b17a68e5300
1 parent
774ec54c81
Exists in
master
and in
1 other branch
增加设置parentid
Showing 1 changed file with 16 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
View file @
c7fa086
| ... | ... | @@ -41,11 +41,22 @@ |
| 41 | 41 | //末次月经 |
| 42 | 42 | private String lastMenses; |
| 43 | 43 | |
| 44 | + //建档类型 0 未分娩建档 1儿童建档时建档 | |
| 45 | + private String dueType; | |
| 46 | + | |
| 44 | 47 | // 胎数 |
| 45 | 48 | private String tireNumber1; |
| 46 | 49 | |
| 47 | 50 | private List data = new ArrayList(); |
| 48 | 51 | |
| 52 | + public String getDueType() { | |
| 53 | + return dueType; | |
| 54 | + } | |
| 55 | + | |
| 56 | + public void setDueType(String dueType) { | |
| 57 | + this.dueType = dueType; | |
| 58 | + } | |
| 59 | + | |
| 49 | 60 | public String getTireNumber1() { |
| 50 | 61 | return tireNumber1; |
| 51 | 62 | } |
| ... | ... | @@ -68,6 +79,9 @@ |
| 68 | 79 | if (null != patients.getDueDate()) { |
| 69 | 80 | setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
| 70 | 81 | } |
| 82 | + if(null!=patients.getBuildType()){ | |
| 83 | + dueType=0==patients.getBuildType()?"0":"1"; | |
| 84 | + } | |
| 71 | 85 | setName(patients.getUsername()); |
| 72 | 86 | setPhone(patients.getPhone()); |
| 73 | 87 | setRemarks(patients.getMremark()); |
| ... | ... | @@ -177,8 +191,7 @@ |
| 177 | 191 | private String id; |
| 178 | 192 | private String checkTime; |
| 179 | 193 | private String enableEdit = "0"; |
| 180 | - //建档类型 0 未分娩建档 1儿童建档时建档 | |
| 181 | - private String dueType; | |
| 194 | + | |
| 182 | 195 | //分娩时间，补录时使用 |
| 183 | 196 | private String dueDate; |
| 184 | 197 | public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime,Integer buildType,Date dueDate) { |
| ... | ... | @@ -190,9 +203,7 @@ |
| 190 | 203 | Date date = DateUtil.parseYMD(deliverModel.getDueDate()); |
| 191 | 204 | setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); |
| 192 | 205 | } |
| 193 | - if(null!=buildType){ | |
| 194 | - dueType=0==buildType?"0":"1"; | |
| 195 | - } | |
| 206 | + | |
| 196 | 207 | if(null!=dueDate){ |
| 197 | 208 | this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); |
| 198 | 209 | } |
| ... | ... | @@ -204,14 +215,6 @@ |
| 204 | 215 | |
| 205 | 216 | public void setDueDate(String dueDate) { |
| 206 | 217 | this.dueDate = dueDate; |
| 207 | - } | |
| 208 | - | |
| 209 | - public String getDueType() { | |
| 210 | - return dueType; | |
| 211 | - } | |
| 212 | - | |
| 213 | - public void setDueType(String dueType) { | |
| 214 | - this.dueType = dueType; | |
| 215 | 218 | } |
| 216 | 219 | |
| 217 | 220 | public String getEnableEdit() { |