Commit 8649d81d410d74b188e94163aaacc82e22610f84
1 parent
2021b18d9f
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 6 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
8649d81
| ... | ... | @@ -899,7 +899,7 @@ |
| 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 | - if(p.getBuildType() == 3 || p.getBuildType() == 2) { | |
| 902 | + if(p.getType() == 3 || p.getBuildType() == 2) { | |
| 903 | 903 | map.put("week", "已分娩"); |
| 904 | 904 | } else { |
| 905 | 905 | map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); |
| ... | ... | @@ -1068,8 +1068,11 @@ |
| 1068 | 1068 | temp.put("residenceAddress", residenceAddress.replace("null", "")); /** 居住地 */ |
| 1069 | 1069 | String householdAddress = findName(pt.getProvinceId()) + findName(pt.getCityId()) + findName(pt.getAreaId()) + findName(pt.getStreetId()) + pt.getAddress(); |
| 1070 | 1070 | temp.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */ |
| 1071 | - temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); /** 当前孕周 */ | |
| 1072 | - System.out.println(pt.getBookbuildingDate().toLocaleString()); | |
| 1071 | + if(pt.getType() == 3 || pt.getBuildType() == 2) { /** 当前孕周 */ | |
| 1072 | + map.put("week", "已分娩"); | |
| 1073 | + } else { | |
| 1074 | + map.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); | |
| 1075 | + } | |
| 1073 | 1076 | temp.put("buildWeek", DateUtil.getWeekDesc(pt.getLastMenses(), pt.getBookbuildingDate())); /** 建档孕周 */ |
| 1074 | 1077 | temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); /** 建档日期 */ |
| 1075 | 1078 | temp.put("doctorName", couponMapper.getUserName(pt.getBookbuildingDoctor())); |