From 82118ac61e8ab5a97657d757bf42f1c77d89ab54 Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 27 May 2019 09:31:58 +0800 Subject: [PATCH] =?UTF-8?q?wutaotao=2020190527=20=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E5=AD=95=E5=A6=87=E7=99=BB=E8=AE=B0=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/PatientFacade.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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())) { -- 1.8.3.1