Merge branch 'face' into 'master'

Face

See merge request !99

search/utils/auto_tips.py

@@ -203,8 +203,10 @@ def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=No
         get_tag_wiki_data = list()
         ret_list = list()
         doctor_hospital_equal_query = list()
+        get_hospital_data_gt_50 = list()
         tag_equal_query = list()
-        result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name=sub_index_name, query_body=q,offset=offset, size=size, is_suggest_request=True)
+        result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name=sub_index_name, query_body=q,
+                                                   offset=offset, size=size, is_suggest_request=True)
         for tips_item in result_dict["suggest"]["tips-suggest"]:
             for hit_item in tips_item["options"]:
                 hit_item["_source"]["ori_name"] = hit_item["_source"]["ori_name"].replace("超声刀", "超声提升")
@@ -236,12 +238,12 @@ def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=No
                                     hit_item["_source"]["describe"] = ">50km"
                             else:
                                 hit_item["_source"]["describe"] = ""
-
                         else:
                             hit_item["_source"]["describe"] = ""
-
                         if hit_item["_source"]["ori_name"] == query:
                             doctor_hospital_equal_query.append(hit_item["_source"])
+                        elif hit_item["_source"]["describe"] == ">50km":
+                            get_hospital_data_gt_50.append(hit_item["_source"])
                         else:
                             get_doctor_hospital_data.append(hit_item["_source"])
 
@@ -267,6 +269,7 @@ def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=No
             ret_list.extend(doctor_hospital_equal_query)
             ret_list.extend(get_tag_wiki_data)
             ret_list.extend(get_doctor_hospital_data)
+            ret_list.extend(get_hospital_data_gt_50)
 
         return have_read_tips_set, ret_list, result_dict
     except: