Merge branch 'face' into 'master'

Face

See merge request !97

trans2es/utils/hospital_transfer.py

@@ -33,9 +33,8 @@ class HospitalTransfer(object):
                 # item_dict["id"] = getMd5Digest(str(name))
                 item_dict["id"] = "hospital_" + str(instance.id)
                 item_dict["ori_name"] = name
-                # item_dict["is_online"] = by_hospital_id_judge_office_online(is_online=instance.is_online,
-                #                                                             hospital_id=instance.id, name=name)
-                item_dict["is_online"] = instance.is_online
+                item_dict["is_online"] = by_hospital_id_judge_office_online(hospital_id=instance.id, name=name)
+                # item_dict["is_online"] = instance.is_online
                 item_dict["order_weight"] = QueryWordAttr.get_hospital_query_word_weight(name=name,
                                                                                          hospital_id=instance.id)
                 item_dict["results_num"] = QueryWordAttr.get_query_results_num(name)
@@ -86,9 +85,8 @@ class HospitalTransferV1(object):
                 # item_dict["id"] = getMd5Digest(str(name))
                 item_dict["id"] = "hospital_" + str(instance.id)
                 item_dict["ori_name"] = name
-                # item_dict["is_online"] = by_hospital_id_judge_office_online(is_online=instance.is_online,
-                #                                                             hospital_id=instance.id, name=name)
-                item_dict["is_online"] = instance.is_online
+                item_dict["is_online"] = by_hospital_id_judge_office_online(hospital_id=instance.id)
+                # item_dict["is_online"] = instance.is_online
                 item_dict["order_weight"] = QueryWordAttr.get_hospital_query_word_weight(name=name,
                                                                                          hospital_id=instance.id)
                 item_dict["results_num"] = QueryWordAttr.get_query_results_num(name)
@@ -119,7 +117,7 @@ class HospitalTransferV1(object):
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
 
 
-def by_hospital_id_judge_office_online(is_online=False, hospital_id=None, name=None):
+def by_hospital_id_judge_office_online(hospital_id=None):
     try:
         office = Doctor.objects.filter(is_online=True, doctor_type=1, hospital_id=hospital_id)
         if office: