Commit 096a4bd733585564f9fc206121803fa193bc8091
1 parent
b0284bcbe9
Exists in
master
and in
6 other branches
肌萎缩
Showing 1 changed file with 12 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
View file @
096a4bd
| ... | ... | @@ -39,6 +39,7 @@ |
| 39 | 39 | private Integer age; |
| 40 | 40 | //孕周 |
| 41 | 41 | private String dueWeek; |
| 42 | + private Integer currentWeek; | |
| 42 | 43 | //预产期 |
| 43 | 44 | private String yChanQi; |
| 44 | 45 | //手机号 |
| 45 | 46 | |
| 46 | 47 | |
| ... | ... | @@ -404,12 +405,15 @@ |
| 404 | 405 | setVcCardNo(patients.getVcCardNo()); |
| 405 | 406 | if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { |
| 406 | 407 | this.dueWeek = "终止妊娠"; |
| 408 | + this.currentWeek = -1; | |
| 407 | 409 | } else if (3 == patients.getType()) { |
| 408 | 410 | this.dueWeek = "已分娩"; |
| 411 | + this.currentWeek = -2; | |
| 409 | 412 | } else { |
| 410 | 413 | if (null != patients.getLastMenses()) { |
| 411 | 414 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |
| 412 | 415 | this.dueWeek = StringUtils.dueWeek(days); |
| 416 | + this.currentWeek = DateUtil.getWeek(patients.getLastMenses(), new Date()); | |
| 413 | 417 | } |
| 414 | 418 | } |
| 415 | 419 | if (null != patients.getLastMenses()) { |
| ... | ... | @@ -435,6 +439,14 @@ |
| 435 | 439 | */ |
| 436 | 440 | private String mensStopStartDay; |
| 437 | 441 | private String mensStopEndDay; |
| 442 | + | |
| 443 | + public Integer getCurrentWeek() { | |
| 444 | + return currentWeek; | |
| 445 | + } | |
| 446 | + | |
| 447 | + public void setCurrentWeek(Integer currentWeek) { | |
| 448 | + this.currentWeek = currentWeek; | |
| 449 | + } | |
| 438 | 450 | |
| 439 | 451 | public String getMensStopStartDay() { |
| 440 | 452 | return mensStopStartDay; |