Commit 093186154402dd80993d90fc900f17398a822c74
1 parent
232160172e
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 5 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
0931861
| ... | ... | @@ -899,7 +899,11 @@ |
| 899 | 899 | map.put("username", p.getUsername()); |
| 900 | 900 | map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone())); |
| 901 | 901 | map.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo())); |
| 902 | - map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); | |
| 902 | + if(p.getType() == 3 && p.getBuildType() == 2) { | |
| 903 | + map.put("week", "已分娩"); | |
| 904 | + } else { | |
| 905 | + map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); | |
| 906 | + } | |
| 903 | 907 | map.put("doctorName", couponMapper.getUserName(p.getBookbuildingDoctor())); |
| 904 | 908 | String hName = hospitalNameCache.get(p.getHospitalId()); |
| 905 | 909 | if(StringUtils.isEmpty(hName)) { |