Commit 6b63a20f0a35798f0ee8a3bd5a1457da630014b1
1 parent
b8359aeb66
Exists in
master
修改产检删除
Showing 1 changed file with 18 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
View file @
6b63a20
| ... | ... | @@ -23,6 +23,17 @@ |
| 23 | 23 | private String age; |
| 24 | 24 | //当前孕周 |
| 25 | 25 | private String cDueWeek; |
| 26 | + //当前孕周 | |
| 27 | + private String cDueWeek2; | |
| 28 | + | |
| 29 | + public String getcDueWeek2() { | |
| 30 | + return cDueWeek2; | |
| 31 | + } | |
| 32 | + | |
| 33 | + public void setcDueWeek2(String cDueWeek2) { | |
| 34 | + this.cDueWeek2 = cDueWeek2; | |
| 35 | + } | |
| 36 | + | |
| 26 | 37 | //胎数 |
| 27 | 38 | private String tireNumber=SPIT; |
| 28 | 39 | |
| ... | ... | @@ -274,6 +285,13 @@ |
| 274 | 285 | if(null!=destModel.getLastMenses()){ |
| 275 | 286 | int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date()); |
| 276 | 287 | this.cDueWeek= StringUtils.dueWeek(days); |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + int week = (days / 7); | |
| 292 | + String str = week + "周"; | |
| 293 | + int day = (days % 7); | |
| 294 | + this.cDueWeek2="孕" + str + (day > 0 ? "+" + day + "天" : ""); | |
| 277 | 295 | } |
| 278 | 296 | if(null!=destModel.getTireNumber()){ |
| 279 | 297 | setTireNumber(TaiShuEnums.getTitle(destModel.getTireNumber() + "")); |