Commit 82118ac61e8ab5a97657d757bf42f1c77d89ab54
1 parent
f545f04dcc
Exists in
master
and in
6 other branches
wutaotao 20190527 重点孕妇登记表导出
Showing 1 changed file with 13 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
82118ac
| ... | ... | @@ -1069,8 +1069,9 @@ |
| 1069 | 1069 | keyPregnantWomenExcelModel.setUsername(patients.getUsername()); |
| 1070 | 1070 | //年龄：产妇年龄 ==age |
| 1071 | 1071 | keyPregnantWomenExcelModel.setAge(patients.getAge()); |
| 1072 | - //户籍：本市（常住）、外地常住（暂住）、流动 ==address | |
| 1073 | - keyPregnantWomenExcelModel.setAddress(patients.getAddress()); | |
| 1072 | + //户籍：本市（常住）、外地常住（暂住）、流动 | |
| 1073 | + String basicConfig = getBasicConfig(patients.getPliveTypeId()); | |
| 1074 | + keyPregnantWomenExcelModel.setAddress(basicConfig); | |
| 1074 | 1075 | |
| 1075 | 1076 | AntExChuModel data = antExService.findOne(patients.getId()); |
| 1076 | 1077 | //孕次：怀孕次数== 查看母子实现 |
| ... | ... | @@ -1137,7 +1138,16 @@ |
| 1137 | 1138 | } catch (Exception e) { |
| 1138 | 1139 | ExceptionUtils.catchException(e, e.getMessage()); } |
| 1139 | 1140 | } |
| 1140 | - | |
| 1141 | + private String getBasicConfig(String id) { | |
| 1142 | + if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) { | |
| 1143 | + return ""; | |
| 1144 | + } | |
| 1145 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); | |
| 1146 | + if (null != basicConfig) { | |
| 1147 | + return basicConfig.getName(); | |
| 1148 | + } | |
| 1149 | + return ""; | |
| 1150 | + } | |
| 1141 | 1151 | private void getRiskLevelId(Patients patients, KeyPregnantWomenExcelModel keyPregnantWomenExcelModel) { |
| 1142 | 1152 | List level = new ArrayList(); |
| 1143 | 1153 | if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getRiskLevelId())) { |