diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index a6d4634..54fb4db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -24,6 +24,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; +import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.DataPermissionsModelQuery; import com.lyms.platform.query.PatientsQuery; @@ -88,7 +89,8 @@ public class PatientFacade { private SmsConfigFacade smsConfigFacade; @Autowired private MatDeliverService matDeliverService; - + @Autowired + private ViewFacade viewFacade; @Autowired private SyncDataService syncDataService; @Autowired @@ -1502,10 +1504,15 @@ public class PatientFacade { String hospitalName = couponMapper.getHospitalName(patients.getHospitalId()); healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName); //镇街、村居或单位:现住地址 - healthHandbookExcelModel.setAddress(patients.getAddress()); + Map map = viewFacade.getPatientViewData(patients, patients.getId()); + healthHandbookExcelModel.setAddress(map.get("register").toString()); //孩次:分娩儿童数 - AntExChuModel data = antExService.findOne(patients.getId()); - healthHandbookExcelModel.setChildTime(data == null ? 1 : (data.getProdTime() == null ? 1 : data.getProdTime() + 1)); + AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录 + antExChuQuery.setParentId(patients.getId()); + List antExChulist = antExService.queryAntExChu(antExChuQuery); + + AntExChuModel data = antExService.findOne(antExChulist.get(0).getId()); + healthHandbookExcelModel.setChildTime(data == null ? 0 : (data.getProdTime() == null ? 0 : data.getProdTime() + 1)); //孕期:当前使用有孕== 有孕 healthHandbookExcelModel.setGestation(healthHandbookExcelModel.getGestation()); //发放日期:当前日期