diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java index 00e78e4..ec928c2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java @@ -93,18 +93,23 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { AntenatalExaminationModel examinationModels = antenatalExaminationModels.get(0); if (examinationModels != null && StringUtils.isNotEmpty(examinationModels.getConfigItemId())) { String strCept = examinationModels.getConfigItemId(); - String[] string = strCept.split(","); - for (String s1 : string) { - List list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s1).intValue()); - for (CheckItem checkItem : list1) { - Map map = new HashMap(); - map.put("id", checkItem.getId()); - map.put("project", checkItem.getProject()); - map.put("projectInfo", checkItem.getProjectInfo()); - map.put("checkAttention", checkItem.getCheckAttention()); - list2.add(map); + if (StringUtils.isNotEmpty(strCept)) { + String[] string = strCept.split(","); + for (String s1 : string) { + if (StringUtils.isNotEmpty(s1)) { + List list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s1).intValue()); + for (CheckItem checkItem : list1) { + Map map = new HashMap(); + map.put("id", checkItem.getId()); + map.put("project", checkItem.getProject()); + map.put("projectInfo", checkItem.getProjectInfo()); + map.put("checkAttention", checkItem.getCheckAttention()); + list2.add(map); + } + } } } + } return list2; @@ -115,14 +120,16 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { String[] str = antExChuModel.getConfigItemId().split(","); if (null != str && str.length > 0) { for (String s2 : str) { - List list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s2).intValue()); - for (CheckItem checkItem : list1) { - Map map = new HashMap(); - map.put("id", checkItem.getId()); - map.put("project", checkItem.getProject()); - map.put("projectInfo", checkItem.getProjectInfo()); - map.put("checkAttention", checkItem.getCheckAttention()); - list2.add(map); + if (StringUtils.isNotEmpty(s2)) { + List list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s2).intValue()); + for (CheckItem checkItem : list1) { + Map map = new HashMap(); + map.put("id", checkItem.getId()); + map.put("project", checkItem.getProject()); + map.put("projectInfo", checkItem.getProjectInfo()); + map.put("checkAttention", checkItem.getCheckAttention()); + list2.add(map); + } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 9c7832a..c0a95cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -782,13 +782,17 @@ public class BabyCheckFacade { Map checkRecord = new HashMap<>(); Date checkDate = cmodel.getCheckDate(); String monthAge = ""; + int month = 0; if (babyBirth != null && checkDate != null) { monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); + month = DateUtil.getMonth(babyBirth, new Date()); } + checkRecord.put("parentId", cmodel.getBuildId()); checkRecord.put("id", cmodel.getId()); checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate)); checkRecord.put("monthAge", monthAge); + checkRecord.put("month", String.valueOf(month)); checkRecord.put("buildId", cmodel.getBuildId()); checkRecord.put("type", "2"); //根据规则完善儿保套餐(处理老数据,没有儿保月龄套餐) @@ -2350,7 +2354,7 @@ public class BabyCheckFacade { //2019 6月计划 婴幼儿指导报告 去掉每日所需营养素、个月龄饮食指南和喂养指南进行整合为一项 //每日所需营养素 - data.put("yys", getYys(month)); + data.put("yys", getYys(month)); } }