Commit b67602ad8667b2db4180d7d076a4d61dc8eb2453
1 parent
603b5ddfb7
Exists in
master
and in
6 other branches
母子还原到第一次修改
Showing 1 changed file with 2 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
b67602a
| ... | ... | @@ -1512,20 +1512,11 @@ |
| 1512 | 1512 | BeanUtils.copy(patients, healthHandbookExcelModel); |
| 1513 | 1513 | //女方姓名：孕妇姓名 ==username |
| 1514 | 1514 | healthHandbookExcelModel.setUsername(patients.getUsername()); |
| 1515 | - | |
| 1516 | 1515 | //身份证号码：孕妇身份证号码 ==cardNo |
| 1517 | 1516 | healthHandbookExcelModel.setCardNo(patients.getCardNo()); |
| 1518 | 1517 | //发放机构：当前机构名称== 当前机构名称 |
| 1519 | 1518 | String hospitalName = couponMapper.getHospitalName(patients.getHospitalId()); |
| 1520 | 1519 | healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName); |
| 1521 | - //镇街、村居或单位：现住地址 | |
| 1522 | - healthHandbookExcelModel.setAddress(patients.getAddress()); | |
| 1523 | - //孩次：分娩儿童数 | |
| 1524 | - AntExChuModel data = antExService.findOne(patients.getId()); | |
| 1525 | - Integer i = data.getProdTime() + 1; | |
| 1526 | - healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : i.toString())); | |
| 1527 | - /*//孕期：当前使用有孕== 有孕 | |
| 1528 | - | |
| 1529 | 1520 | if(patients!=null && patients.getId()!=null){ |
| 1530 | 1521 | //镇街、村居或单位：现住地址 |
| 1531 | 1522 | Map<String, Object> map = viewFacade.getPatientViewData(patients, patients.getId()); |
| ... | ... | @@ -1545,7 +1536,8 @@ |
| 1545 | 1536 | }else{ |
| 1546 | 1537 | healthHandbookExcelModel.setAddress(""); |
| 1547 | 1538 | healthHandbookExcelModel.setChildTime(""); |
| 1548 | - }*/ | |
| 1539 | + | |
| 1540 | + } | |
| 1549 | 1541 | |
| 1550 | 1542 | //孕期：当前使用有孕== 有孕 |
| 1551 | 1543 | healthHandbookExcelModel.setGestation(healthHandbookExcelModel.getGestation()); |