From d6fbfdb0a5b959f6c286c6bf70ca254c3a4c0c04 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 4 Jun 2018 20:30:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/job/index/restore/data/ConvertHelper.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java index 3dd44ec..0be700b 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java @@ -942,9 +942,18 @@ public class ConvertHelper { } //流产 antChuJson.put("abortion", abortion.toString()); - //孕产史 - antChuJson.put("hisGestation", "孕次:" + StringUtils.unitHandle(antExChuModel.getPregnancyTimes(), UnitConstants.CI) + " 产次:" + StringUtils.unitHandle(antExChuModel.getProdTime(), UnitConstants.CI) + " 流产次:" + StringUtils.unitHandle(antExChuModel.getAbortion(), UnitConstants.CI) + " 存活胎儿数:" + StringUtils.unitHandle(antExChuModel.getSurvFetus(), UnitConstants.REN)); + String ycNum = StringUtils.unitHandle(antExChuModel.getPregnancyTimes(), UnitConstants.CI); + String ccNum = StringUtils.unitHandle(antExChuModel.getProdTime(), UnitConstants.CI); + String lccNum = StringUtils.unitHandle(antExChuModel.getAbortion(), UnitConstants.CI); + String chNum = StringUtils.unitHandle(antExChuModel.getSurvFetus(), UnitConstants.REN); + + //孕产史 + antChuJson.put("hisGestation", "孕次:" + + ycNum==null?"":ycNum + " 产次:" + + ccNum==null?"":ccNum + " 流产次:" + + lccNum==null?"":lccNum + " 存活胎儿数:" + + chNum==null?"":chNum); try { //国家高危+自定义高危 List highrisks = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); -- 1.8.3.1