|
@@ -58,17 +58,14 @@ public class PretreatmentRule {
|
|
|
if (preResultList != null) {
|
|
|
for (PreResult result : preResultList) {
|
|
|
//规则库中匹配
|
|
|
- if (kl_rule_filter_map.get(result.getDetailName()) != null) {
|
|
|
- List<Rule> rules = kl_rule_filter_map.get(result.getDetailName());
|
|
|
+ if (kl_rule_filter_map.get(result.getUniqueName()) != null) {
|
|
|
+ List<Rule> rules = kl_rule_filter_map.get(result.getUniqueName());
|
|
|
if (rules == null) {
|
|
|
continue;
|
|
|
}
|
|
|
for (Rule rule : rules) {
|
|
|
- if (StringUtils.isEmpty(rule.getPub_name()) || !result.getUniqueName().equals(rule.getPub_name())) {
|
|
|
- continue;
|
|
|
- }
|
|
|
content = conceptConvert(result, rule, content);
|
|
|
- rule.setOriginText(result.getDetailName() + ":" + result.getValue() + result.getUnits());
|
|
|
+ rule.setOriginText(result.getUniqueName() + ":" + result.getValue() + result.getUnits());
|
|
|
if (accord_rule_map.get(ruleType) == null) {
|
|
|
accord_rules = new ArrayList<>();
|
|
|
} else {
|