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 45e8e16..8275eea 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 @@ -1069,8 +1069,9 @@ public class PatientFacade { keyPregnantWomenExcelModel.setUsername(patients.getUsername()); //年龄:产妇年龄 ==age keyPregnantWomenExcelModel.setAge(patients.getAge()); - //户籍:本市(常住)、外地常住(暂住)、流动 ==address - keyPregnantWomenExcelModel.setAddress(patients.getAddress()); + //户籍:本市(常住)、外地常住(暂住)、流动 + String basicConfig = getBasicConfig(patients.getPliveTypeId()); + keyPregnantWomenExcelModel.setAddress(basicConfig); AntExChuModel data = antExService.findOne(patients.getId()); //孕次:怀孕次数== 查看母子实现 @@ -1137,7 +1138,16 @@ public class PatientFacade { } catch (Exception e) { ExceptionUtils.catchException(e, e.getMessage()); } } - + private String getBasicConfig(String id) { + if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) { + return ""; + } + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); + if (null != basicConfig) { + return basicConfig.getName(); + } + return ""; + } private void getRiskLevelId(Patients patients, KeyPregnantWomenExcelModel keyPregnantWomenExcelModel) { List level = new ArrayList(); if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getRiskLevelId())) {