条件查询

src/main/java/com/yihu/ehr/resource/controller/TextSearchEndPoint.java

@@ -269,9 +269,9 @@ public class TextSearchEndPoint extends EnvelopRestEndPoint {
                substring = ClientUtils.escapeQueryChars(substring);
                if(StringUtils.isNotBlank(substring)){
                    if(StringUtils.isBlank(q)){
                        q+="-" + ResourceCells.SEARCH_FIELD + ":" + substring ;
                        q+="-" + ResourceCells.SEARCH_FIELD + ":*" + substring +"*";
                    }else{
                        q+=" AND -" + ResourceCells.SEARCH_FIELD + ":" +  substring;
                        q+=" AND -" + ResourceCells.SEARCH_FIELD + ":*" +  substring+"*";
                    }
                }
            }else if(temp.startsWith("+")){
@@ -279,18 +279,18 @@ public class TextSearchEndPoint extends EnvelopRestEndPoint {
                substring = ClientUtils.escapeQueryChars(substring);
                if(StringUtils.isNotBlank(substring)){
                    if(StringUtils.isBlank(q)){
                        q+= ResourceCells.SEARCH_FIELD + ":" + temp.substring(1,temp.length());
                        q+= ResourceCells.SEARCH_FIELD + ":*" + temp.substring(1,temp.length())+"*";
                    }else{
                        q+=" AND " + ResourceCells.SEARCH_FIELD + ":" + temp.substring(1,temp.length());
                        q+=" AND " + ResourceCells.SEARCH_FIELD + ":*" + temp.substring(1,temp.length())+"*";
                    }
                }
            }else{
                if(StringUtils.isNotBlank(temp)){
                    temp = ClientUtils.escapeQueryChars(temp);
                    if(StringUtils.isBlank(q)){
                        q+= ResourceCells.SEARCH_FIELD + ":" + temp;
                        q+= ResourceCells.SEARCH_FIELD + ":*" + temp+"*";
                    }else{
                        q+=" AND " + ResourceCells.SEARCH_FIELD + ":" + temp;
                        q+=" AND " + ResourceCells.SEARCH_FIELD + ":*" + temp+"*";
                    }
                }
            }