| 
															
																@@ -250,11 +250,18 @@ class Mvp: 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             city = people[1] 
															 | 
															
															 | 
															
																             city = people[1] 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             if city: 
															 | 
															
															 | 
															
																             if city: 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                 city = str(city).split('市')[0] + '市' 
															 | 
															
															 | 
															
																                 city = str(city).split('市')[0] + '市' 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            nld = people[2] 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            nld = list(str(people[2]).split(',')) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            nld_1 = None 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            if len(nld) > 0: 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+                nld_1 = nld[0] 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            else: 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+                nld_1 = '' 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             sex = people[3] 
															 | 
															
															 | 
															
																             sex = people[3] 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             sub_option_ids = people[4] 
															 | 
															
															 | 
															
																             sub_option_ids = people[4] 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             testcaseid = people[5] 
															 | 
															
															 | 
															
																             testcaseid = people[5] 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            if city is None and testcaseid > 75: 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            testcastids = list(map(int, str(testcaseid).split(','))) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            gt_75 = [x for x in testcastids if x > 75] 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            if city is None and len(gt_75) > 0: 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                 # 从答题结果中获取城市信息 
															 | 
															
															 | 
															
																                 # 从答题结果中获取城市信息 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                 citys = self.marketing_db.select(self.sql_16, [uuid]) 
															 | 
															
															 | 
															
																                 citys = self.marketing_db.select(self.sql_16, [uuid]) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                 if len(citys) > 0: 
															 | 
															
															 | 
															
																                 if len(citys) > 0: 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -268,7 +275,7 @@ class Mvp: 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                     crowd.append(self.crowd_info[option[1]]) 
															 | 
															
															 | 
															
																                     crowd.append(self.crowd_info[option[1]]) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             else: 
															 | 
															
															 | 
															
																             else: 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                 crowd.extend(self.get_people_uuid_by_sub_option_ids(sub_option_ids)) 
															 | 
															
															 | 
															
																                 crowd.extend(self.get_people_uuid_by_sub_option_ids(sub_option_ids)) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            people_info = PeopleInfo(uuid, city, nld, sex, crowd) 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            people_info = PeopleInfo(uuid, city, nld_1, sex, crowd) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             people_infos.append(people_info) 
															 | 
															
															 | 
															
																             people_infos.append(people_info) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         return people_infos 
															 | 
															
															 | 
															
																         return people_infos 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 |