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 f9d593b..9c30b45 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 @@ -1512,11 +1512,19 @@ public class PatientFacade { BeanUtils.copy(patients, healthHandbookExcelModel); //女方姓名:孕妇姓名 ==username healthHandbookExcelModel.setUsername(patients.getUsername()); + //身份证号码:孕妇身份证号码 ==cardNo healthHandbookExcelModel.setCardNo(patients.getCardNo()); //发放机构:当前机构名称== 当前机构名称 String hospitalName = couponMapper.getHospitalName(patients.getHospitalId()); healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName); + //镇街、村居或单位:现住地址 + healthHandbookExcelModel.setAddress(patients.getAddress()); + //孩次:分娩儿童数 + AntExChuModel data = antExService.findOne(patients.getId()); + Integer i = data.getProdTime() + 1; + healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : i.toString())); + /*//孕期:当前使用有孕== 有孕 if(patients!=null && patients.getId()!=null){ //镇街、村居或单位:现住地址 @@ -1537,10 +1545,7 @@ public class PatientFacade { }else{ healthHandbookExcelModel.setAddress(""); healthHandbookExcelModel.setChildTime(""); - } - - - + }*/ //孕期:当前使用有孕== 有孕 healthHandbookExcelModel.setGestation(healthHandbookExcelModel.getGestation());