Commit da5d29e297fe0835176ced3297f414c09fe03e48
1 parent
6d0ae702b9
Exists in
master
and in
6 other branches
a
Showing 1 changed file with 39 additions and 37 deletions
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java
View file @
da5d29e
| ... | ... | @@ -1207,47 +1207,49 @@ |
| 1207 | 1207 | List data = new ArrayList(); |
| 1208 | 1208 | List dat1a = new ArrayList(); |
| 1209 | 1209 | Integer score = null; |
| 1210 | - if (CollectionUtils.isNotEmpty(id)) { | |
| 1210 | + if (null!=id&&CollectionUtils.isNotEmpty(id)) { | |
| 1211 | 1211 | score = 0; |
| 1212 | 1212 | for (String i : id) { |
| 1213 | - basicConfigQuery.setId(i); | |
| 1214 | - List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); | |
| 1215 | - if (CollectionUtils.isNotEmpty(basicConfigs)) { | |
| 1216 | - Integer crisis = null; | |
| 1217 | - for (BasicConfig basicConfig : basicConfigs) { | |
| 1218 | - Map<String, Object> map = new HashMap<>(); | |
| 1219 | - map.put("id", basicConfig.getId()); | |
| 1220 | - map.put("name", basicConfig.getName()); | |
| 1221 | - map.put("code", basicConfig.getCode()); | |
| 1222 | - RiskDetails riskDetails = new RiskDetails(); | |
| 1223 | - if (StringUtils.isNotEmpty(basicConfig.getCode())) { | |
| 1224 | - score += NumberUtils.toInt(basicConfig.getCode(), 0); | |
| 1225 | - riskDetails.setScore(NumberUtils.toInt(basicConfig.getCode())); | |
| 1226 | - } | |
| 1227 | - riskDetails.setCreated(new Date()); | |
| 1228 | - riskDetails.setYn(YnEnums.YES.getId()); | |
| 1229 | - riskDetails.setModified(new Date()); | |
| 1230 | - riskDetails.setPatientId(parentId); | |
| 1231 | - riskDetails.setTitle(basicConfig.getName()); | |
| 1213 | + if(StringUtils.isNotEmpty(i)){ | |
| 1214 | + basicConfigQuery.setId(i); | |
| 1215 | + List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); | |
| 1216 | + if (CollectionUtils.isNotEmpty(basicConfigs)) { | |
| 1217 | + Integer crisis = null; | |
| 1218 | + for (BasicConfig basicConfig : basicConfigs) { | |
| 1219 | + Map<String, Object> map = new HashMap<>(); | |
| 1220 | + map.put("id", basicConfig.getId()); | |
| 1221 | + map.put("name", basicConfig.getName()); | |
| 1222 | + map.put("code", basicConfig.getCode()); | |
| 1223 | + RiskDetails riskDetails = new RiskDetails(); | |
| 1224 | + if (StringUtils.isNotEmpty(basicConfig.getCode())) { | |
| 1225 | + score += NumberUtils.toInt(basicConfig.getCode(), 0); | |
| 1226 | + riskDetails.setScore(NumberUtils.toInt(basicConfig.getCode())); | |
| 1227 | + } | |
| 1228 | + riskDetails.setCreated(new Date()); | |
| 1229 | + riskDetails.setYn(YnEnums.YES.getId()); | |
| 1230 | + riskDetails.setModified(new Date()); | |
| 1231 | + riskDetails.setPatientId(parentId); | |
| 1232 | + riskDetails.setTitle(basicConfig.getName()); | |
| 1232 | 1233 | |
| 1233 | - riskDetails.setPublishId(0); | |
| 1234 | - riskDetails.setPublishName("system-worker"); | |
| 1235 | - String basicConfig1 = highLevel.get(basicConfig.getParentId()); | |
| 1236 | - if (null != basicConfig1) { | |
| 1237 | - Map<String, Object> map1 = new HashMap<>(); | |
| 1238 | - map1.put("id", basicConfig.getParentId()); | |
| 1239 | - String name = basicConfig1; | |
| 1240 | - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name)&&name.indexOf("预警") > -1) { | |
| 1241 | - name = name.replace("预警", ""); | |
| 1234 | + riskDetails.setPublishId(0); | |
| 1235 | + riskDetails.setPublishName("system-worker"); | |
| 1236 | + String basicConfig1 = highLevel.get(basicConfig.getParentId()); | |
| 1237 | + if (null != basicConfig1) { | |
| 1238 | + Map<String, Object> map1 = new HashMap<>(); | |
| 1239 | + map1.put("id", basicConfig.getParentId()); | |
| 1240 | + String name = basicConfig1; | |
| 1241 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name)&&name.indexOf("预警") > -1) { | |
| 1242 | + name = name.replace("预警", ""); | |
| 1243 | + } | |
| 1244 | + map1.put("name", name); | |
| 1245 | + crisis = SyncDataWork.map.get(name) == null ? null : SyncDataWork.map.get(name).getId(); | |
| 1246 | + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 1247 | + dat1a.add(map1); | |
| 1242 | 1248 | } |
| 1243 | - map1.put("name", name); | |
| 1244 | - crisis = SyncDataWork.map.get(name) == null ? null : SyncDataWork.map.get(name).getId(); | |
| 1245 | - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 1246 | - dat1a.add(map1); | |
| 1249 | + riskDetails.setCrisis(crisis); | |
| 1250 | + riskDetailsService.addRiskDetails(riskDetails); | |
| 1251 | + data.add(map); | |
| 1247 | 1252 | } |
| 1248 | - riskDetails.setCrisis(crisis); | |
| 1249 | - riskDetailsService.addRiskDetails(riskDetails); | |
| 1250 | - data.add(map); | |
| 1251 | 1253 | } |
| 1252 | 1254 | } |
| 1253 | 1255 | } |