Commit 71988314b183d0bea51256ae3bcedd7d55ddc0fa
1 parent
e0858c6b45
Exists in
master
and in
6 other branches
母子建档手册导出——孩次错误
母子健康手册导出——地址 文档提供的是 现居住地址
Showing 1 changed file with 11 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
7198831
| ... | ... | @@ -24,6 +24,7 @@ |
| 24 | 24 | import com.lyms.platform.permission.service.OrganizationService; |
| 25 | 25 | import com.lyms.platform.permission.service.UsersService; |
| 26 | 26 | import com.lyms.platform.pojo.*; |
| 27 | +import com.lyms.platform.query.AntExChuQuery; | |
| 27 | 28 | import com.lyms.platform.query.BabyModelQuery; |
| 28 | 29 | import com.lyms.platform.query.DataPermissionsModelQuery; |
| 29 | 30 | import com.lyms.platform.query.PatientsQuery; |
| 30 | 31 | |
| ... | ... | @@ -88,8 +89,9 @@ |
| 88 | 89 | private SmsConfigFacade smsConfigFacade; |
| 89 | 90 | @Autowired |
| 90 | 91 | private MatDeliverService matDeliverService; |
| 91 | - | |
| 92 | 92 | @Autowired |
| 93 | + private ViewFacade viewFacade; | |
| 94 | + @Autowired | |
| 93 | 95 | private SyncDataService syncDataService; |
| 94 | 96 | @Autowired |
| 95 | 97 | private DataPermissionService dataPermissionService; |
| 96 | 98 | |
| ... | ... | @@ -1502,10 +1504,15 @@ |
| 1502 | 1504 | String hospitalName = couponMapper.getHospitalName(patients.getHospitalId()); |
| 1503 | 1505 | healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName); |
| 1504 | 1506 | //镇街、村居或单位：现住地址 |
| 1505 | - healthHandbookExcelModel.setAddress(patients.getAddress()); | |
| 1507 | + Map<String, Object> map = viewFacade.getPatientViewData(patients, patients.getId()); | |
| 1508 | + healthHandbookExcelModel.setAddress(map.get("register").toString()); | |
| 1506 | 1509 | //孩次：分娩儿童数 |
| 1507 | - AntExChuModel data = antExService.findOne(patients.getId()); | |
| 1508 | - healthHandbookExcelModel.setChildTime(data == null ? 1 : (data.getProdTime() == null ? 1 : data.getProdTime() + 1)); | |
| 1510 | + AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录 | |
| 1511 | + antExChuQuery.setParentId(patients.getId()); | |
| 1512 | + List<AntExChuModel> antExChulist = antExService.queryAntExChu(antExChuQuery); | |
| 1513 | + | |
| 1514 | + AntExChuModel data = antExService.findOne(antExChulist.get(0).getId()); | |
| 1515 | + healthHandbookExcelModel.setChildTime(data == null ? 0 : (data.getProdTime() == null ? 0 : data.getProdTime() + 1)); | |
| 1509 | 1516 | //孕期：当前使用有孕== 有孕 |
| 1510 | 1517 | healthHandbookExcelModel.setGestation(healthHandbookExcelModel.getGestation()); |
| 1511 | 1518 | //发放日期：当前日期 |