Merge branch 'online' into 'master'

Online

See merge request !17

trans2es/utils/doctor_transfer.py

@@ -81,21 +81,27 @@ class DoctorTransfer(object):
     def get_doctor_suggest_data_list(cls, instance):
         try:
             ret_list = list()
-
-            item_dict = dict()
-            item_dict["id"] = getMd5Digest(str(instance.name))
-            item_dict["ori_name"] = instance.name
-            item_dict["is_online"] = instance.is_online
-
-            item_dict["order_weight"] = QueryWordAttr.get_doctor_query_word_weight(instance.name)
-            item_dict["results_num"] = QueryWordAttr.get_query_results_num(instance.name)
-            item_dict["type_flag"] = get_tips_word_type(instance.name)
-            item_dict["offline_score"] = 0.0
-            item_dict["tips_name_type"] = 2
-
-            ret_list.append(item_dict)
-
-            suggest_list = get_tips_suggest_list(instance.name)
+            keyword = instance.name
+            cut_bool = False
+            cut_word = ["下线", "停用", "已经下线", "账号停用"]
+            for i in cut_word:
+                if keyword.find(i) >= 0:
+                    cut_bool = True
+            if cut_bool == False:
+                item_dict = dict()
+                item_dict["id"] = getMd5Digest(str(instance.name))
+                item_dict["ori_name"] = instance.name
+                item_dict["is_online"] = instance.is_online
+
+                item_dict["order_weight"] = QueryWordAttr.get_doctor_query_word_weight(instance.name)
+                item_dict["results_num"] = QueryWordAttr.get_query_results_num(instance.name)
+                item_dict["type_flag"] = get_tips_word_type(instance.name)
+                item_dict["offline_score"] = 0.0
+                item_dict["tips_name_type"] = 2
+
+                ret_list.append(item_dict)
+
+                suggest_list = get_tips_suggest_list(instance.name)
 
             return (item_dict, suggest_list)
         except:

trans2es/utils/hospital_transfer.py

@@ -21,21 +21,26 @@ class HospitalTransfer(object):
             ret_list = list()
 
             name = instance.name.strip()
-
-            item_dict = dict()
-            item_dict["id"] = getMd5Digest(str(name))
-            item_dict["ori_name"] = name
-            item_dict["is_online"] = instance.is_online
-
-            item_dict["order_weight"] = QueryWordAttr.get_hospital_query_word_weight(name)
-            item_dict["results_num"] = QueryWordAttr.get_query_results_num(name)
-            item_dict["type_flag"] = get_tips_word_type(name)
-            item_dict["offline_score"] = 0.0
-            item_dict["tips_name_type"] = 1
-
-            ret_list.append(item_dict)
-
-            suggest_list = get_tips_suggest_list(name)
+            cut_bool = False
+            cut_word = ["下线", "停用", "已经下线", "账号停用"]
+            for i in cut_word:
+                if name.find(i) >= 0:
+                    cut_bool = True
+            if cut_bool == False:
+                item_dict = dict()
+                item_dict["id"] = getMd5Digest(str(name))
+                item_dict["ori_name"] = name
+                item_dict["is_online"] = instance.is_online
+
+                item_dict["order_weight"] = QueryWordAttr.get_hospital_query_word_weight(name)
+                item_dict["results_num"] = QueryWordAttr.get_query_results_num(name)
+                item_dict["type_flag"] = get_tips_word_type(name)
+                item_dict["offline_score"] = 0.0
+                item_dict["tips_name_type"] = 1
+
+                ret_list.append(item_dict)
+
+                suggest_list = get_tips_suggest_list(name)
 
             return (item_dict, suggest_list)
         except:

trans2es/utils/tag_transfer.py

@@ -91,21 +91,27 @@ class TagTransfer(object):
     def get_tag_suggest_data_list(cls, instance):
         try:
             ret_list = list()
-
-            item_dict = dict()
-            item_dict["id"] = getMd5Digest(str(instance.name))
-            item_dict["ori_name"] = instance.name
-            item_dict["is_online"] = instance.is_online
-
-            item_dict["order_weight"] = QueryWordAttr.get_project_query_word_weight(instance.name)
-            item_dict["results_num"] = QueryWordAttr.get_query_results_num(instance.name)
-            item_dict["type_flag"] = get_tips_word_type(instance.name)
-            item_dict["offline_score"] = 0.0
-            item_dict["tips_name_type"] = 0
-
-            ret_list.append(item_dict)
-
-            suggest_list = get_tips_suggest_list(instance.name)
+            keyword = instance.name
+            cut_bool = False
+            cut_word = ["下线", "停用", "已经下线", "账号停用"]
+            for i in cut_word:
+                if keyword.find(i) >= 0:
+                    cut_bool = True
+            if cut_bool == False:
+                item_dict = dict()
+                item_dict["id"] = getMd5Digest(str(instance.name))
+                item_dict["ori_name"] = instance.name
+                item_dict["is_online"] = instance.is_online
+
+                item_dict["order_weight"] = QueryWordAttr.get_project_query_word_weight(instance.name)
+                item_dict["results_num"] = QueryWordAttr.get_query_results_num(instance.name)
+                item_dict["type_flag"] = get_tips_word_type(instance.name)
+                item_dict["offline_score"] = 0.0
+                item_dict["tips_name_type"] = 0
+
+                ret_list.append(item_dict)
+
+                suggest_list = get_tips_suggest_list(instance.name)
 
             return (item_dict, suggest_list)
         except: