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);