Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/statistics/ScreenImpl.java

@@ -451,7 +451,7 @@ public class ScreenImpl implements IScreenService {
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         //设置模糊搜索
         searchSourceBuilder.query(QueryBuilders.boolQuery()
-                .must(QueryBuilders.matchQuery("USE_PLACE_CODE", "##610324"))
+                .must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*"+screenDto.getCityCode()+"*"))
                 .must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true)));
         searchSourceBuilder.aggregation(
                         AggregationBuilders.terms("USE_SITE_CODE").field("USE_SITE_CODE")