louhr пре 5 година
родитељ
комит
c24b43d065

+ 9 - 20
common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -68,28 +68,17 @@ public class PretreatmentRule {
                             if (StringUtils.isEmpty(rule.getSet_name()) || !result.getName().equals(rule.getSet_name())) {
                                 continue;
                             }
-                            content = conceptConvert(result, rule, content);
-                            rule.setOriginText(result.getDetailName() + ":" + result.getValue() + result.getUnits());
-                            if (accord_rule_map.get(ruleType) == null) {
-                                accord_rules = new ArrayList<>();
-                            } else {
-                                accord_rules = accord_rule_map.get(ruleType);
-                            }
-                            accord_rules.add(rule);
-                            accord_rule_map.put(ruleType, accord_rules);
-                            searchData.setRules(accord_rule_map);
+                        }
+                        content = conceptConvert(result, rule, content);
+                        rule.setOriginText(result.getDetailName() + ":" + result.getValue() + result.getUnits());
+                        if (accord_rule_map.get(ruleType) == null) {
+                            accord_rules = new ArrayList<>();
                         } else {
-                            content = conceptConvert(result, rule, content);
-                            rule.setOriginText(result.getDetailName() + ":" + result.getValue() + result.getUnits());
-                            if (accord_rule_map.get(ruleType) == null) {
-                                accord_rules = new ArrayList<>();
-                            } else {
-                                accord_rules = accord_rule_map.get(ruleType);
-                            }
-                            accord_rules.add(rule);
-                            accord_rule_map.put(ruleType, accord_rules);
-                            searchData.setRules(accord_rule_map);
+                            accord_rules = accord_rule_map.get(ruleType);
                         }
+                        accord_rules.add(rule);
+                        accord_rule_map.put(ruleType, accord_rules);
+                        searchData.setRules(accord_rule_map);
                     }
                 }
             }