Merge branch 'hisp' into 'master'

add

See merge request !78

libs/tools.py

@@ -58,26 +58,26 @@ def point_distance(lon1, lat1, lon2, lat2):
     # haversine公式
     dlon = lon2 - lon1
     dlat = lat2 - lat1
-    a = sin(dlat / 2)**2 + cos(lat1) * cos(lat2) * sin(dlon / 2)**2
+    a = sin(dlat / 2) ** 2 + cos(lat1) * cos(lat2) * sin(dlon / 2) ** 2
     c = 2 * asin(sqrt(a))
     r = 6371  # 地球平均半径，单位为km
     return c * r * 1000
 
 
 class HostpitalPosInfo(object):
-
     hospital_pos_dict = dict()
+
     @classmethod
     def get_hostpital_info(cls):
         try:
             if len(cls.hospital_pos_dict) == 0:
-                query_results = doctor.Hospital.objects.filter(is_online=True)
-                #query_results = django.db.models.QuerySet(model=doctor.Hospital, query=query)
+                query_results = doctor.Hospital.objects.filter()
+                # query_results = django.db.models.QuerySet(model=doctor.Hospital, query=query)
                 for item in query_results:
                     name = item.name
                     lng = float(item.baidu_loc_lng)
                     lat = float(item.baidu_loc_lat)
-                    cls.hospital_pos_dict[name] = [lng,lat]
+                    cls.hospital_pos_dict[name] = [lng, lat]
 
             return cls.hospital_pos_dict
         except:
@@ -85,4 +85,4 @@ class HostpitalPosInfo(object):
             return cls.hospital_pos_dict
 
 
-g_hospital_pos_dict = HostpitalPosInfo.get_hostpital_info()
\ No newline at end of file
+g_hospital_pos_dict = HostpitalPosInfo.get_hostpital_info()