|  | @@ -151,7 +151,8 @@ class Mvp:
 | 
	
		
			
				|  |  |      # 根据用户uuid获取城市信息
 | 
	
		
			
				|  |  |      sql_16 = '''
 | 
	
		
			
				|  |  |          SELECT
 | 
	
		
			
				|  |  | -            *
 | 
	
		
			
				|  |  | +            a.uuid,
 | 
	
		
			
				|  |  | +            b.sub_option_content
 | 
	
		
			
				|  |  |          FROM
 | 
	
		
			
				|  |  |              f_t_daren_score_2 a
 | 
	
		
			
				|  |  |          LEFT JOIN d_shangju_tiku_02 b ON a.testcase_id = b.testcase_id
 | 
	
	
		
			
				|  | @@ -162,7 +163,7 @@ class Mvp:
 | 
	
		
			
				|  |  |              OR a.score = b.sub_option_id
 | 
	
		
			
				|  |  |          )
 | 
	
		
			
				|  |  |          AND a.uuid = %s
 | 
	
		
			
				|  |  | -        AND a.sub_question_id = 303
 | 
	
		
			
				|  |  | +        AND a.sub_question_id = 303 and a.status = b.status = 1
 | 
	
		
			
				|  |  |      '''
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      # 答题人人群分类信息
 | 
	
	
		
			
				|  | @@ -244,11 +245,13 @@ class Mvp:
 | 
	
		
			
				|  |  |          :return:
 | 
	
		
			
				|  |  |          """
 | 
	
		
			
				|  |  |          people_info_city = self.marketing_db.select(self.sql_15)
 | 
	
		
			
				|  |  | -        return people_info_city
 | 
	
		
			
				|  |  |          people_infos = []
 | 
	
		
			
				|  |  |          for people in people_info_city:
 | 
	
		
			
				|  |  |              uuid = people[0]
 | 
	
		
			
				|  |  |              city = people[1]
 | 
	
		
			
				|  |  | +            sex = people[3]
 | 
	
		
			
				|  |  | +            sub_option_ids = people[4]
 | 
	
		
			
				|  |  | +            testcaseid = people[5]
 | 
	
		
			
				|  |  |              if str(city).strip():
 | 
	
		
			
				|  |  |                  city = str(city).split('市')[0] + '市'
 | 
	
		
			
				|  |  |              nld = people[2]
 | 
	
	
		
			
				|  | @@ -258,9 +261,7 @@ class Mvp:
 | 
	
		
			
				|  |  |                      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:
 |