diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java index d357bf4..cd79920 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java @@ -470,6 +470,18 @@ public class DiagnoseEnums { return list; } + + public static Integer getIdByParentId(Integer parentId,String name) + { + for(JwsChildEnums s : JwsChildEnums.values()) { + if (s.getParentId() == parentId && s.getTitle().equals(name)) + { + return s.getId(); + } + } + return null; + } + public int getId() { return id; } diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java index 7caba52..8064642 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java @@ -1022,7 +1022,8 @@ public class SyncDataWork { List list2 = null; boolean isdel = false; try { - if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) + && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { String otherHighRisk = antExChuModel.getOtherHighRisk(); List otherHighRisks = new ArrayList<>(); if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 456be56..3227fca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -3758,21 +3758,38 @@ public class AntenatalExaminationFacade { if ("yes".equals(map.get("yesOrNo"))) { List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.jws.getId()); - //循环系统类 - if (map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3") != null) + + if (CollectionUtils.isNotEmpty(items)) { - Map map1 = (Map)map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3"); - if (map1 != null) + //循环系统类 + if (map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3") != null) { - String checkBox = String.valueOf(map1.get("checkBox")); - List selecteds = (List)map1.get("selected"); - if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds)) + Map map1 = (Map)map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3"); + if (map1 != null) { - for (String key : selecteds) + String checkBox = String.valueOf(map1.get("checkBox")); + List selecteds = (List)map1.get("selected"); + if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds)) { - if ("".equals(key)) + for (String key : selecteds) { - + BasicConfig config = basicConfigService.getOneBasicConfigById(key); + if (config != null && StringUtils.isNotEmpty(config.getName())) + { + Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentId(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getId(), config.getName()); + if (cid != null) + { + for (DiagnoseItemModel item : items) + { + if (String.valueOf(cid).equals(item.getValueTwo()) + && + CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } } } } @@ -3780,8 +3797,6 @@ public class AntenatalExaminationFacade { } } } - - } List> riskList = diagnoseConfigFacde.getRiskName(list); 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 2515fe0..fe78ce9 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 @@ -849,6 +849,7 @@ public class BabyCheckFacade { base.setMremark(model.getMremark()); base.setMphone(model.getMphone()); base.setMname(model.getMname()); + base.setVcCardNo(model.getVcCardNo()); } } return model;