Commit 6e082a309e5bac6f683f66b8c7a1aa1789126075
1 parent
f195a88ec9
Exists in
master
and in
8 other branches
孕妇分娩后 变成产妇
Showing 1 changed file with 10 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
View file @
6e082a3
| ... | ... | @@ -7,6 +7,8 @@ |
| 7 | 7 | import com.lyms.platform.common.utils.StringUtils; |
| 8 | 8 | import com.lyms.platform.pojo.Patients; |
| 9 | 9 | |
| 10 | +import java.util.Date; | |
| 11 | + | |
| 10 | 12 | /** |
| 11 | 13 | * 全部孕妇管理 |
| 12 | 14 | * |
| ... | ... | @@ -149,7 +151,13 @@ |
| 149 | 151 | setId(destModel.getId()); |
| 150 | 152 | setName(destModel.getUsername()); |
| 151 | 153 | setAge(destModel.getAge()); |
| 152 | - setDueWeek("孕周"); | |
| 154 | + if(null!=destModel.getLastMenses()){ | |
| 155 | + int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date()); | |
| 156 | + String week= (days/7)+""; | |
| 157 | + int day = (days%7); | |
| 158 | + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); | |
| 159 | + } | |
| 160 | + | |
| 153 | 161 | setrLevel(destModel.getRiskLevelId()); |
| 154 | 162 | if(null!=destModel.getNextCheckTime()) { |
| 155 | 163 | setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime())); |
| ... | ... | @@ -160,7 +168,7 @@ |
| 160 | 168 | setPid(destModel.getPid()); |
| 161 | 169 | setPhone(StringUtils.encryPhone(destModel.getPhone())); |
| 162 | 170 | setCheckDoctor(destModel.getLastReportDoctorName()); |
| 163 | - setlName("登记人"); | |
| 171 | + setlName(destModel.getPublishName()); | |
| 164 | 172 | if(null!=destModel.getServiceType()){ |
| 165 | 173 | setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType())); |
| 166 | 174 | } |