diff --git a/src/main/java/org/snomed/snowstorm/core/data/domain/QueryConcept.java b/src/main/java/org/snomed/snowstorm/core/data/domain/QueryConcept.java index 0ecd7eb83..e9decc1ab 100644 --- a/src/main/java/org/snomed/snowstorm/core/data/domain/QueryConcept.java +++ b/src/main/java/org/snomed/snowstorm/core/data/domain/QueryConcept.java @@ -31,6 +31,7 @@ public interface Fields { String ATTR = "attr"; String ATTR_MAP = "attrMap"; String START = "start"; + String REFSETS = "refsets"; } @Field(type = FieldType.Keyword) @@ -57,6 +58,9 @@ public interface Fields { // groupNo:attr=value:attr=value,value|groupNo:attr=value:attr=value,value private String attrMap; + @Field(type = FieldType.Long) + private Set refsets; + @Transient private Map>> groupedAttributesMap; @@ -83,6 +87,7 @@ public QueryConcept(QueryConcept queryConcept) { stated = queryConcept.stated; attrMap = queryConcept.attrMap; serializeGroupedAttributesMap();// Populates attr field + refsets = queryConcept.refsets; } public void clearAttributes() { @@ -237,7 +242,8 @@ public void setStated(boolean stated) { public boolean fieldsMatch(QueryConcept other) { if (!this.equals(other) || !this.getParents().equals(other.getParents()) - || !this.getAncestors().equals(other.getAncestors())) { + || !this.getAncestors().equals(other.getAncestors()) + || !Objects.equals(this.getRefsets(), other.getRefsets())) { return false; } final Map>> groupedAttributesMap = orEmpty(this.getGroupedAttributesMap()); @@ -260,6 +266,14 @@ public boolean isCreating() { return creating; } + public Set getRefsets() { + return refsets; + } + + public void setRefsets(Set refsets) { + this.refsets = refsets; + } + @Override public String toString() { return "QueryConcept{" +