add

search/utils/auto_tips.py

@@ -107,7 +107,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
                 }
             },
             "_source": {
-                "includes": ["id", "ori_name", "offline_score", "is_online", "type_flag", "results_num"]
+                "includes": ["id", "ori_name", "offline_score", "is_online", "type_flag", "results_num", "portrait"]
             }
         }
         get_doctor_hospital_data = list()
@@ -120,6 +120,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
         for tips_item in result_dict["suggest"]["tips-suggest"]:
             for hit_item in tips_item["options"]:
 
+                logging.info("get hit_item:%s" % hit_item)
                 if hit_item["_source"]["ori_name"] not in have_read_tips_set:
                     have_read_tips_set.add(hit_item["_source"]["ori_name"])
                     highlight_marks = u'<ems>%s</ems>' % query
@@ -162,6 +163,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
             ret_list.extend(get_tag_wiki_data)
             ret_list.extend(get_doctor_hospital_data)
 
+        logging.info("get ret_list:%s" % ret_list)
         if len(result_dict["suggest"]["tips-suggest"]) >= 50:
             return ret_list
 
@@ -172,7 +174,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
             QUERY_KEY = "query:search_tip"
             query_base64 = base64.b64encode(query.encode('utf8')).decode('utf8')
             if redis_client.hget(QUERY_KEY, query_base64) is not None:
-                value_data = json.loads(str(redis_client.hget(QUERY_KEY, query_base64),encoding='utf-8'))
+                value_data = json.loads(str(redis_client.hget(QUERY_KEY, query_base64), encoding='utf-8'))
 
             if len(value_data) > 0:
                 for i in value_data:
@@ -196,7 +198,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
                                 {"results_num": result_num, "ori_name": ori_name, "id": None, "is_online": True,
                                  "offline_score": 0,
                                  "type_flag": get_tips_word_type(ori_name), "highlight_name": highlight_name,
-                                 "describe": describe})
+                                 "describe": describe, "portrait": ""})
                 ret_list.extend(query_ret_list)
                 ret_list.extend(wordresemble_ret_list)
             if len(ret_list) >= 50:

trans2es/mapping/suggest.json

@@ -21,6 +21,6 @@
     "results_num":{"type":"integer"},//结果数量
     "type_flag":{"type":"keyword"},
     "is_online":{"type":"boolean"},//上线
-    "url":{"type":"string"}
+    "portrait":{"type":"text"}
   }
 }

trans2es/models/doctor.py

@@ -12,6 +12,7 @@ from gm_types.gaia import (
     DOCTOR_PROCESS_STATUS, DOCTOR_TYPE, PHONE_HINTS, TOPIC_TYPE, TAG_TYPE, DisplayTag,
     SERVICE_FLAG)
 from trans2es.commons.commons import uuid4
+from gm_upload import ImgUrlField, IMG_TYPE
 
 
 class Hospital(models.Model):
@@ -24,7 +25,7 @@ class Hospital(models.Model):
     id = models.CharField(max_length=100, primary_key=True, default=uuid4)
     name = models.CharField(max_length=100, unique=True, help_text=u"医院名称")
     is_online = models.BooleanField(default=False, help_text=u"是否上线", verbose_name=u"上线")
-
+    portrait = ImgUrlField(img_type=IMG_TYPE.DOCTOR, max_length=200, help_text=u"医生头像", blank=True, default='')
     google_loc_lng = models.FloatField(default=0, help_text=u"经度(-180~180)")
     google_loc_lat = models.FloatField(default=0, help_text=u"纬度")
     baidu_loc_lng = models.FloatField(default=0, help_text=u"经度(-180~180)")
@@ -60,5 +61,3 @@ class Service(models.Model):
     doctor = models.ForeignKey(Doctor, related_name='services')
     phone = models.CharField(max_length=20, null=True, blank=True, verbose_name=u'服务电话')
     is_online = models.BooleanField(default=False, help_text=u"是否上线", verbose_name=u"上线")
-
-

trans2es/utils/brandwiki_transfer.py

@@ -30,7 +30,7 @@ class BrandWikiTransfer(object):
             item_dict["type_flag"] = get_tips_word_type(instance.name)
             item_dict["offline_score"] = 0.0
             item_dict["tips_name_type"] = 3
-
+            item_dict["portrait"] = ""
             ret_list.append(item_dict)
 
             suggest_list = get_tips_suggest_list(instance.name)

trans2es/utils/collectwiki_transfer.py

@@ -30,6 +30,7 @@ class CollectWikiTransfer(object):
             item_dict["type_flag"] = get_tips_word_type(instance.name)
             item_dict["offline_score"] = 0.0
             item_dict["tips_name_type"] = 3
+            item_dict["portrait"] = ""
 
             ret_list.append(item_dict)
 

trans2es/utils/doctor_transfer.py

@@ -100,6 +100,7 @@ class DoctorTransfer(object):
                 item_dict["type_flag"] = get_tips_word_type(instance.name)
                 item_dict["offline_score"] = 0.0
                 item_dict["tips_name_type"] = 2
+                item_dict["portrait"] =""
 
                 ret_list.append(item_dict)
 

trans2es/utils/hospital_transfer.py

@@ -40,6 +40,7 @@ class HospitalTransfer(object):
                 item_dict["type_flag"] = get_tips_word_type(name)
                 item_dict["offline_score"] = 0.0
                 item_dict["tips_name_type"] = 1
+                item_dict["portrait"] = instance.portrait
 
                 ret_list.append(item_dict)
 

trans2es/utils/itemwiki_transfer.py

@@ -94,6 +94,7 @@ class ItemWikiTransfer(object):
             item_dict["type_flag"] = get_tips_word_type(instance.name)
             item_dict["offline_score"] = 0.0
             item_dict["tips_name_type"] = 3
+            item_dict["portrait"] = ""
 
             ret_list.append(item_dict)
 

trans2es/utils/productwiki_transfer.py

@@ -30,7 +30,7 @@ class ProduceWikiTransfer(object):
             item_dict["type_flag"] = get_tips_word_type(instance.name)
             item_dict["offline_score"] = 0.0
             item_dict["tips_name_type"] = 3
-
+            item_dict["portrait"] = ""
             ret_list.append(item_dict)
 
             suggest_list = get_tips_suggest_list(instance.name)

trans2es/utils/tag_transfer.py

@@ -108,7 +108,7 @@ class TagTransfer(object):
                 item_dict["type_flag"] = get_tips_word_type(instance.name)
                 item_dict["offline_score"] = 0.0
                 item_dict["tips_name_type"] = 0
-
+                item_dict["portrait"] = ""
                 ret_list.append(item_dict)
 
                 suggest_list = get_tips_suggest_list(instance.name)

trans2es/utils/wordresemble.py

@@ -59,6 +59,7 @@ class WordResemble(object):
                     item_dict["type_flag"] = get_tips_word_type(instance.keyword)
                     item_dict["offline_score"] = 0.0
                     item_dict["tips_name_type"] = 4
+                    item_dict["portrait"] = ""
                     ret_list.append(item_dict)
                     suggest_list = get_tips_suggest_list(instance.keyword)