Commit ace37d8cce7dea4c524cb2b381a86a64c95ad147
1 parent
82ea499bc8
Exists in
master
and in
6 other branches
设置修改分娩时间
Showing 1 changed file with 8 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
View file @
ace37d8
| ... | ... | @@ -112,8 +112,13 @@ |
| 112 | 112 | |
| 113 | 113 | public AntData(Patients model,String hospitalName) { |
| 114 | 114 | this.id = model.getId(); |
| 115 | - int days = DateUtil.daysBetween(model.getLastMenses(), model.getBookbuildingDate()); | |
| 116 | - this.dueWeek = StringUtils.dueWeek(days); | |
| 115 | + if((model.getIsAutoFm()!=null&& model.getIsAutoFm() == 1)){ | |
| 116 | + this.dueWeek = "已分娩"; | |
| 117 | + }else { | |
| 118 | + int days = DateUtil.daysBetween(model.getLastMenses(), model.getBookbuildingDate()); | |
| 119 | + this.dueWeek = StringUtils.dueWeek(days); | |
| 120 | + } | |
| 121 | + | |
| 117 | 122 | this.checkTime = DateUtil.getyyyy_MM_dd(model.getBookbuildingDate()); |
| 118 | 123 | this.created=model.getBookbuildingDate(); |
| 119 | 124 | this.title="孕妇建档"; |
| ... | ... | @@ -153,7 +158,7 @@ |
| 153 | 158 | int days = DateUtil.daysBetween(dueDate,postReviewModel.getLeaveHospitalDate()); |
| 154 | 159 | this.dueWeek= "产后"+days+"天"; |
| 155 | 160 | this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); |
| 156 | - this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getLeaveHospitalDate()); | |
| 161 | + this.checkTime = DateUtil.getyyyy_MM_dd(postReviewModel.getLeaveHospitalDate()); | |
| 157 | 162 | this.created=postReviewModel.getLeaveHospitalDate(); |
| 158 | 163 | this.title="出院小结"; |
| 159 | 164 | this.type="6"; |