|  | @@ -248,35 +248,39 @@ class Mvp:
 | 
	
		
			
				|  |  |          for people in people_info_city:
 | 
	
		
			
				|  |  |              uuid = people[0]
 | 
	
		
			
				|  |  |              city = people[1]
 | 
	
		
			
				|  |  | -            if city:
 | 
	
		
			
				|  |  | -                city = str(city).split('市')[0] + '市'
 | 
	
		
			
				|  |  |              nld = people[2]
 | 
	
		
			
				|  |  | -            if nld:
 | 
	
		
			
				|  |  | -                nld_1 = list(str(people[2]).split(','))
 | 
	
		
			
				|  |  | -                if len(nld) > 0:
 | 
	
		
			
				|  |  | -                    nld_1 = nld[0]
 | 
	
		
			
				|  |  | -            else:
 | 
	
		
			
				|  |  | -                nld_1 = ''
 | 
	
		
			
				|  |  |              sex = people[3]
 | 
	
		
			
				|  |  | -            sub_option_ids = people[4]
 | 
	
		
			
				|  |  | +            sub_ids = people[4]
 | 
	
		
			
				|  |  |              testcaseid = people[5]
 | 
	
		
			
				|  |  | -            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])
 | 
	
		
			
				|  |  | -                if len(citys) > 0:
 | 
	
		
			
				|  |  | -                    city = citys[0][1]
 | 
	
		
			
				|  |  | -            # 根据用户子选项id集合,获取用户的人群分类
 | 
	
		
			
				|  |  | -            crowd = []
 | 
	
		
			
				|  |  | -            if len(gt_75) > 0:
 | 
	
		
			
				|  |  | -                # 特定的测试人群分类从答题结果中获取
 | 
	
		
			
				|  |  | -                sub_option_ids = self.marketing_db.select(self.sql_17, [uuid])
 | 
	
		
			
				|  |  | -                for option in sub_option_ids:
 | 
	
		
			
				|  |  | -                    crowd.append(self.crowd_info[option[1]])
 | 
	
		
			
				|  |  | -            else:
 | 
	
		
			
				|  |  | -                crowd.extend(self.get_people_uuid_by_sub_option_ids(sub_option_ids))
 | 
	
		
			
				|  |  | -            people_info = PeopleInfo(uuid, city, nld_1, sex, crowd)
 | 
	
		
			
				|  |  | +            # if city:
 | 
	
		
			
				|  |  | +            #     city = str(city).split('市')[0] + '市'
 | 
	
		
			
				|  |  | +            # nld = people[2]
 | 
	
		
			
				|  |  | +            # if nld:
 | 
	
		
			
				|  |  | +            #     nld_1 = list(str(people[2]).split(','))
 | 
	
		
			
				|  |  | +            #     if len(nld) > 0:
 | 
	
		
			
				|  |  | +            #         nld_1 = nld[0]
 | 
	
		
			
				|  |  | +            # else:
 | 
	
		
			
				|  |  | +            #     nld_1 = ''
 | 
	
		
			
				|  |  | +            # sex = people[3]
 | 
	
		
			
				|  |  | +            # sub_option_ids = people[4]
 | 
	
		
			
				|  |  | +            # testcaseid = people[5]
 | 
	
		
			
				|  |  | +            # 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])
 | 
	
		
			
				|  |  | +            #     if len(citys) > 0:
 | 
	
		
			
				|  |  | +            #         city = citys[0][1]
 | 
	
		
			
				|  |  | +            # # 根据用户子选项id集合,获取用户的人群分类
 | 
	
		
			
				|  |  | +            # crowd = []
 | 
	
		
			
				|  |  | +            # if len(gt_75) > 0:
 | 
	
		
			
				|  |  | +            #     # 特定的测试人群分类从答题结果中获取
 | 
	
		
			
				|  |  | +            #     sub_option_ids = self.marketing_db.select(self.sql_17, [uuid])
 | 
	
		
			
				|  |  | +            #     for option in sub_option_ids:
 | 
	
		
			
				|  |  | +            #         crowd.append(self.crowd_info[option[1]])
 | 
	
		
			
				|  |  | +            # else:
 | 
	
		
			
				|  |  | +            #     crowd.extend(self.get_people_uuid_by_sub_option_ids(sub_option_ids))
 | 
	
		
			
				|  |  | +            people_info = PeopleInfo(uuid, city, nld, sex, sub_ids)
 | 
	
		
			
				|  |  |              people_infos.append(people_info)
 | 
	
		
			
				|  |  |          return people_infos
 | 
	
		
			
				|  |  |  
 |