Commit fbe4e18f028903112f668b4ec1fe15e0f5fd4620
1 parent
bd9dfdc6e0
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 2 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
fbe4e18
| ... | ... | @@ -903,6 +903,7 @@ |
| 903 | 903 | cnames.put("证件号", "证件号"); |
| 904 | 904 | cnames.put("建档日期", "建档日期"); |
| 905 | 905 | cnames.put("建档孕周", "建档孕周"); |
| 906 | + cnames.put("预产期", "预产期"); | |
| 906 | 907 | cnames.put("建档机构", "建档机构"); |
| 907 | 908 | cnames.put("户口所在地", "户口所在地"); |
| 908 | 909 | cnames.put("现住址", "现住址"); |
| ... | ... | @@ -926,6 +927,7 @@ |
| 926 | 927 | result.put("证件号", p.getCardNo()); |
| 927 | 928 | result.put("建档日期", DateUtil.getyyyy_MM_dd(p.getBookbuildingDate())); |
| 928 | 929 | result.put("建档孕周", DateUtil.getWeekDesc(p.getLastMenses(), p.getBookbuildingDate())); |
| 930 | + result.put("预产期", DateUtil.getyyyy_MM_dd(p.getDueDate())); | |
| 929 | 931 | result.put("建档机构", hNameCache.get(p.getHospitalId())); |
| 930 | 932 | String householdAddress = findName(p.getProvinceId()) + findName(p.getCityId()) + findName(p.getAreaId()) + findName(p.getStreetId()) + p.getAddress(); |
| 931 | 933 | result.put("户口所在地", householdAddress.replace("null", "")); |