Commit f50da8f0ce76162deb21462133a40e20aa9017a4
1 parent
7ff7b3d8bc
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 16 additions and 18 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
View file @
f50da8f
| ... | ... | @@ -50,6 +50,9 @@ |
| 50 | 50 | private String tireNumber1; |
| 51 | 51 | private String status="0"; |
| 52 | 52 | |
| 53 | + //分娩时间，补录时使用 | |
| 54 | + private String dueDate; | |
| 55 | + | |
| 53 | 56 | private List data = new ArrayList(); |
| 54 | 57 | |
| 55 | 58 | public String getIsGravida() { |
| 56 | 59 | |
| 57 | 60 | |
| ... | ... | @@ -120,10 +123,18 @@ |
| 120 | 123 | int day = (days % 7); |
| 121 | 124 | this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); |
| 122 | 125 | } |
| 123 | - | |
| 126 | + if (null != patients.getFmDate()) { | |
| 127 | + this.dueDate = DateUtil.getyyyy_MM_dd(patients.getFmDate()); | |
| 128 | + } | |
| 124 | 129 | return this; |
| 125 | 130 | } |
| 131 | + public String getDueDate() { | |
| 132 | + return dueDate; | |
| 133 | + } | |
| 126 | 134 | |
| 135 | + public void setDueDate(String dueDate) { | |
| 136 | + this.dueDate = dueDate; | |
| 137 | + } | |
| 127 | 138 | public void setRiskFactor(List riskFactor) { |
| 128 | 139 | this.riskFactor = riskFactor; |
| 129 | 140 | } |
| 130 | 141 | |
| 131 | 142 | |
| 132 | 143 | |
| ... | ... | @@ -216,30 +227,17 @@ |
| 216 | 227 | private String checkTime; |
| 217 | 228 | private String enableEdit = "0"; |
| 218 | 229 | |
| 219 | - //分娩时间，补录时使用 | |
| 220 | - private String dueDate; | |
| 221 | 230 | |
| 222 | - public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime, Integer buildType, Date dueDate) { | |
| 231 | + | |
| 232 | + public MatDeliverExt(MaternalDeliverModel deliverModel) { | |
| 223 | 233 | setCheckTime(deliverModel.getDueDate()); |
| 224 | 234 | setId(deliverModel.getId()); |
| 225 | 235 | setHospitalId(deliverModel.getHospitalId()); |
| 226 | 236 | setHospitalName(deliverModel.getFmHospital()); |
| 227 | - if (null != deliverModel.getDueDate()) { | |
| 237 | + /* if (null != deliverModel.getDueDate()) { | |
| 228 | 238 | Date date = DateUtil.parseYMD(deliverModel.getDueDate()); |
| 229 | 239 | |
| 230 | - } | |
| 231 | - | |
| 232 | - if (null != dueDate) { | |
| 233 | - this.dueDate = DateUtil.getyyyy_MM_dd(dueDate); | |
| 234 | - } | |
| 235 | - } | |
| 236 | - | |
| 237 | - public String getDueDate() { | |
| 238 | - return dueDate; | |
| 239 | - } | |
| 240 | - | |
| 241 | - public void setDueDate(String dueDate) { | |
| 242 | - this.dueDate = dueDate; | |
| 240 | + }*/ | |
| 243 | 241 | } |
| 244 | 242 | |
| 245 | 243 | public String getEnableEdit() { |