|
@@ -102,14 +102,17 @@ public class CatalogueUtil {
|
|
|
if (ListUtil.isEmpty(diags) || StringUtil.isBlank(nature) || StringUtil.isBlank(natureValue)) {
|
|
|
return null;
|
|
|
}
|
|
|
- List<Diag> retDiags = Lists.newArrayList();
|
|
|
RedisUtil redisUtil = SpringContextUtil.getBean("redisUtil");
|
|
|
- Map<String, Map<String, Object>> diagCache = (Map) redisUtil.get("concept_diag_property_map");
|
|
|
+ Map<String, Map<String, String>> conceptDiagPropertyMap = redisUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
|
|
|
+ if (conceptDiagPropertyMap == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ List<Diag> retDiags = Lists.newArrayList();
|
|
|
diags.forEach(i -> {
|
|
|
if (i != null && StringUtil.isNotBlank(i.getName())) {
|
|
|
- Map<String, Object> diagDetailMap = diagCache.get(i.getName());
|
|
|
+ Map<String, String> diagDetailMap = conceptDiagPropertyMap.get(i.getName());
|
|
|
if (diagDetailMap != null) {
|
|
|
- String natureValue_ = (String) diagDetailMap.get(nature);
|
|
|
+ String natureValue_ = diagDetailMap.get(nature);
|
|
|
if (StringUtil.isNotBlank(natureValue_) && natureValue_.equals(natureValue)) {
|
|
|
retDiags.add(i);
|
|
|
}
|