Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/vo/QueryFiledVO.java

@@ -17,6 +17,6 @@ public class QueryFiledVO {
     //栏位选项查询参数
     private String fieldOptionQueryParam;
     private String group;
-
+    private String groupBy;
     private Integer filedType;
 }

src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -42,9 +42,6 @@ public class PatentController {
     @Autowired
     private EsPatentService patentService;
 
-    @Autowired
-    private EsService esService;
-
 
     @Operation(summary = "查询专利")
     @PostMapping("/queryPatent")

src/main/java/cn/cslg/pas/domain/es/Patent.java

@@ -196,13 +196,13 @@ public class Patent {
     private List<Text> claim;
 
     /**
-     * pct申请号
+     * pct申请日
      */
     @JsonProperty("pctappdate")
-    private Integer pctAppDate;
+    private Date pctAppDate;
 
     /**
-     * pct申请日
+     * pct申请号
      */
     @JsonProperty("pctappno")
     private String pctAppNo;
@@ -217,7 +217,7 @@ public class Patent {
      * pct公开日
      */
     @JsonProperty("pctpubdate")
-    private Integer pctPubDate;
+    private Date pctPubDate;
 
     /**
      * pct公开号
@@ -241,7 +241,7 @@ public class Patent {
      * ep申请日
      */
     @JsonProperty("ep_date")
-    private String epDate;
+    private Date epDate;
 
 
     /**

src/main/java/cn/cslg/pas/service/business/es/EsCountService.java

@@ -429,7 +429,7 @@ public class EsCountService {
         List<DateHistogramBucket> list = agg.dateHistogram().buckets().array();
         esCountDTO.setAllNumber(Long.valueOf(String.valueOf(list.size())));
         List<EsCountDetailDTO> esCountDetailDTOS = new ArrayList<>();
-        if (format.equals("半年")) {
+        if (StringUtils.isNotEmpty(format) && format.equals("半年")) {
             List<EsCountDetailDTO> detailDTOList = new ArrayList<>();
             for (DateHistogramBucket bucket : list) {
                 String year = bucket.keyAsString();

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -179,29 +179,29 @@ public class EsService {
         //4. 返回数据
         builder.query(q);
         //排序
-//        List<OrderDTO> dtoList = queryRequest.getOrderDTOList();
-//        if (!CollectionUtils.isEmpty(dtoList)) {
-//            String json = CommonService.readJsonFile("patent.json");
-//            List<EsConfigVO> esConfigVOS = JSON.parseArray(json, EsConfigVO.class);
-//            for (OrderDTO orderDTO : dtoList) {
-//                EsConfigVO configVO = esConfigVOS.stream().filter(item -> item.getField().equals(orderDTO.getOrderBy())).findFirst().orElse(null);
-//                if (configVO != null) {
-//                    if (orderDTO.getOrderType().equals(IfConstant.NO)) {
-//                        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-//                                .field(fieldSortBuilder -> fieldSortBuilder
-//                                        .field(configVO.getEsField()).order(SortOrder.Asc)));
-//                    } else {
-//                        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-//                                .field(fieldSortBuilder -> fieldSortBuilder
-//                                        .field(configVO.getEsField()).order(SortOrder.Desc)));
-//                    }
-//                }
-//            }
-//        } else {
-//            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-//                    .field(fieldSortBuilder -> fieldSortBuilder
-//                            .field("patent_no.keyword").order(SortOrder.Desc)));
-//        }
+        List<OrderDTO> dtoList = queryRequest.getOrderDTOList();
+        if (!CollectionUtils.isEmpty(dtoList)) {
+            String json = CommonService.readJsonFile("patent.json");
+            List<EsConfigVO> esConfigVOS = JSON.parseArray(json, EsConfigVO.class);
+            for (OrderDTO orderDTO : dtoList) {
+                EsConfigVO configVO = esConfigVOS.stream().filter(item -> item.getField().equals(orderDTO.getOrderBy())).findFirst().orElse(null);
+                if (configVO != null) {
+                    if (orderDTO.getOrderType().equals(IfConstant.NO)) {
+                        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+                                .field(fieldSortBuilder -> fieldSortBuilder
+                                        .field(configVO.getEsField()).order(SortOrder.Asc)));
+                    } else {
+                        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+                                .field(fieldSortBuilder -> fieldSortBuilder
+                                        .field(configVO.getEsField()).order(SortOrder.Desc)));
+                    }
+                }
+            }
+        } else {
+            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+                    .field(fieldSortBuilder -> fieldSortBuilder
+                            .field("patent_no.keyword").order(SortOrder.Desc)));
+        }
 
         //分页
         if (current > 0 && size > 0) {

src/main/resources/jsons/esCountAnalysis.json

@@ -301,7 +301,7 @@
   },
   {
     "name": "公开日",
-    "type": "Date",
+    "type": "DateTime",
     "value": "publicDate",
     "field": "publicDate",
     "esField": "public_date",
@@ -313,7 +313,7 @@
   },
   {
     "name": "申请日",
-    "type": "String",
+    "type": "DateTime",
     "value": "appDate",
     "field": "appDate",
     "esField": "app_date",
@@ -325,7 +325,7 @@
   },
   {
     "name": "授权日",
-    "type": "String",
+    "type": "DateTime",
     "value": "grantDate",
     "field": "grantDate",
     "esField": "grant_date",
@@ -351,7 +351,7 @@
     "name": "申请人国家",
     "type": "String",
     "value": "applicantCountry",
-    "field": "DZ",
+    "field": "applicantCountry",
     "esField": "applicant_addr.country",
     "esClass": "termsCountAnalysisBuilder",
     "ifSearch": "false",
@@ -520,7 +520,7 @@
     "type": "String",
     "value": "legalStatus",
     "field": "legalStatus",
-    "esField": "legal_status",
+    "esField": "legal_status.raw",
     "esClass": "termsCountAnalysisBuilder",
     "ifSearch": "false",
     "ifGroup": "false",

src/main/resources/jsons/patent.json

@@ -10,7 +10,8 @@
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "number"
   },
   {
     "name": "申请号",
@@ -23,7 +24,8 @@
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "number"
   },
   {
     "name": "公开号",
@@ -36,7 +38,8 @@
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "number"
   },
   {
     "name": "授权号",
@@ -45,50 +48,54 @@
     "field": "GN",
     "esField": "grant_no.keyword",
     "esClass": "wildcardQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "number"
   },
   {
     "name": "公开日",
-    "type": "Date",
+    "type": "DateTime",
     "value": "publicDate",
     "field": "PD",
     "esField": "public_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "true"
+    "ifStats": "true",
+    "groupBy": "dateType"
   },
   {
     "name": "申请日",
-    "type": "String",
+    "type": "DateTime",
     "value": "appDate",
     "field": "AD",
     "esField": "app_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "true"
+    "ifStats": "true",
+    "groupBy": "dateType"
   },
   {
     "name": "授权日",
-    "type": "String",
+    "type": "DateTime",
     "value": "grantDate",
     "field": "GD",
     "esField": "grant_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "true"
+    "ifStats": "true",
+    "groupBy": "dateType"
   },
   {
     "name": "家族数量",
@@ -123,12 +130,13 @@
     "field": "AB",
     "esField": "abstract_str.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "defaultHidden": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "text"
   },
   {
     "name": "标题",
@@ -137,22 +145,24 @@
     "field": "TI",
     "esField": "title.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "text"
   },
   {
     "name": "实审日",
-    "type": "String",
+    "type": "DateTime",
     "value": "EXD",
     "field": "examinationDate",
     "esField": "examination_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "dateType"
   },
   {
     "name": "申请人",
@@ -161,12 +171,41 @@
     "field": "PA",
     "esField": "applicant.name",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true",
+    "ifStats": "true",
+    "defaultShowStats": "true",
+    "groupBy": "company"
+  },
+  {
+    "name": "标准申请人",
+    "type": "String",
+    "value": "standerApplicant",
+    "field": "SAT",
+    "esField": "stander_applicant.name.key",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
+    "ifStats": "true",
     "ifAsCondition": "true",
+    "groupBy": "company"
+  },
+  {
+    "name": "合并申请人",
+    "type": "String",
+    "value": "mergeApplicant",
+    "field": "MAT",
+    "esField": "merge_applicant.name.key",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
     "ifStats": "true",
-    "defaultShowStats": "true"
+    "ifAsCondition": "true",
+    "groupBy": "company"
   },
   {
     "name": "发明人",
@@ -175,11 +214,12 @@
     "field": "IN",
     "esField": "inventor.name",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "company"
   },
   {
     "name": "权利人",
@@ -188,11 +228,40 @@
     "field": "PE",
     "esField": "right_holder.name",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "company"
+  },
+  {
+    "name": "标准权利人",
+    "type": "String",
+    "value": "standerRightHolder",
+    "field": "SRH",
+    "esField": "stander_right_holder.name.key",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "true",
+    "ifAsCondition": "true",
+    "groupBy": "company"
+  },
+  {
+    "name": "合并权利人",
+    "type": "String",
+    "value": "mergeRightHolder",
+    "field": "MRH",
+    "esField": "merge_right_holder.name.key",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "true",
+    "ifAsCondition": "true",
+    "groupBy": "company"
   },
   {
     "name": "公开说明书文本",
@@ -201,10 +270,12 @@
     "field": "PFT",
     "esField": "public_full_text.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifAsCondition": "true"
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "text"
   },
   {
     "name": "授权说明书文本",
@@ -213,10 +284,12 @@
     "field": "GFT",
     "esField": "grant_full_text.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifAsCondition": "true"
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "text"
   },
   {
     "name": "代理机构",
@@ -225,24 +298,65 @@
     "field": "AGN",
     "esField": "agency",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "company"
   },
   {
     "name": "代理人名称",
     "type": "Array",
     "value": "agent",
     "field": "AG",
-    "esField": "agent",
-    "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "esField": "agent.key",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "company"
+  },
+  {
+    "name": "简单同族数量",
+    "type": "Integer",
+    "value": "simpleFamilyNum",
+    "field": "SFN",
+    "esField": "simple_family_num",
+    "esClass": "numberQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true",
+    "groupBy": "amount"
+  },
+  {
+    "name": "inpadoc同族数量",
+    "type": "Integer",
+    "value": "inpadocFamilyNum",
+    "field": "IFN",
+    "esField": "inpadoc_family_num",
+    "esClass": "numberQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true",
+    "groupBy": "amount"
+  },
+  {
+    "name": "扩展同族数量",
+    "type": "Integer",
+    "value": "patsnapFamilyNum",
+    "field": "PFN",
+    "esField": "patsnap_family_num",
+    "esClass": "numberQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true",
+    "groupBy": "amount"
   },
   {
     "name": "引用专利数量",
@@ -251,10 +365,11 @@
     "field": "QPN",
     "esField": "quote_patent_no_num",
     "esClass": "numberQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "amount"
   },
   {
     "name": "被引用专利数量",
@@ -263,10 +378,11 @@
     "field": "QDPN",
     "esField": "quoted_patent_no_num",
     "esClass": "numberQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "amount"
   },
   {
     "name": "申请人地址",
@@ -275,10 +391,12 @@
     "field": "ADD",
     "esField": "applicant_addr.address",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifAsCondition": "true"
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "address"
   },
   {
     "name": "申请国家",
@@ -287,11 +405,12 @@
     "field": "CO",
     "esField": "app_country",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "申请人国家",
@@ -300,11 +419,12 @@
     "field": "AAC",
     "esField": "applicant_addr.country",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "申请人省份",
@@ -313,11 +433,12 @@
     "field": "ADP",
     "esField": "applicant_addr.province",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "申请人市区",
@@ -326,11 +447,12 @@
     "field": "ADC",
     "esField": "applicant_addr.city",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "申请人区县",
@@ -339,10 +461,11 @@
     "field": "ADA",
     "esField": "applicant_addr.district",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "权利人地址",
@@ -351,10 +474,12 @@
     "field": "RDD",
     "esField": "right_holder_addr.address",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifAsCondition": "true"
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "address"
   },
   {
     "name": "权利人国家",
@@ -363,11 +488,12 @@
     "field": "DZ",
     "esField": "right_holder_addr.country",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "权利人省份",
@@ -376,11 +502,12 @@
     "field": "RDP",
     "esField": "right_holder_addr.province",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "权利人市区",
@@ -389,11 +516,12 @@
     "field": "RDC",
     "esField": "right_holder_addr.city",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "权利人区县",
@@ -402,22 +530,25 @@
     "field": "RDD",
     "esField": "right_holder_addr.district",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "nation"
   },
   {
     "name": "IPC分类号",
     "type": "String",
-    "value": "MC",
+    "value": "IPC",
     "field": "MC",
     "esField": "mipc",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifAsCondition": "true"
+    "ifStats": "true",
+    "ifAsCondition": "true",
+    "groupBy": "classify"
   },
   {
     "name": "IPC分类号一级",
@@ -429,7 +560,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -442,7 +573,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -455,7 +586,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -468,7 +599,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -481,10 +612,24 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
+    "name": "CPC分类号",
+    "type": "String",
+    "value": "CPC",
+    "field": "CPC",
+    "esField": "mcpc",
+    "esClass": "prefixQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "true",
+    "ifAsCondition": "true",
+    "groupBy": "classify"
+  },
+  {
     "name": "CPC分类号一级",
     "type": "String",
     "value": "cpcLevel1",
@@ -494,7 +639,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -507,7 +652,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -520,7 +665,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -533,7 +678,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -546,10 +691,24 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
+    "name": "UPC分类号",
+    "type": "String",
+    "value": "UPC",
+    "field": "UPC",
+    "esField": "mupc",
+    "esClass": "prefixQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "true",
+    "ifAsCondition": "true",
+    "groupBy": "classify"
+  },
+  {
     "name": "UPC分类号一级",
     "type": "String",
     "value": "upcLevel1",
@@ -559,7 +718,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -572,7 +731,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -585,10 +744,24 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
+    "name": "LOC分类号",
+    "type": "String",
+    "value": "LOC",
+    "field": "LOC",
+    "esField": "mloc",
+    "esClass": "prefixQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "true",
+    "ifAsCondition": "true",
+    "groupBy": "classify"
+  },
+  {
     "name": "LOC分类号一级",
     "type": "String",
     "value": "locLevel1",
@@ -598,7 +771,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -611,7 +784,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -624,7 +797,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -634,10 +807,11 @@
     "field": "CL",
     "esField": "claim.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "text"
   },
   {
     "name": "专利状态",
@@ -646,12 +820,13 @@
     "field": "SS",
     "esField": "simple_status",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true",
-    "fieldOptionQueryParam": "PATENT_SIMPLE_STATUS"
+    "fieldOptionQueryParam": "PATENT_SIMPLE_STATUS",
+    "groupBy": "typeStatus"
   },
   {
     "name": "专利类型",
@@ -660,25 +835,181 @@
     "field": "PT",
     "esField": "patent_type",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true",
-    "fieldOptionQueryParam": "PATENT_TYPE"
+    "fieldOptionQueryParam": "PATENT_TYPE",
+    "groupBy": "typeStatus"
   },
   {
     "name": "法律状态",
     "type": "String",
     "value": "legalStatus",
     "field": "LG",
-    "esField": "legal_status",
+    "esField": "legal_status.raw",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "typeStatus"
+  },
+  {
+    "name": "审查员",
+    "type": "String",
+    "value": "examiner",
+    "field": "EXAM",
+    "esField": "examiner.key",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "company"
+  },
+  {
+    "name": "助理审查员",
+    "type": "String",
+    "value": "aidExaminer",
+    "field": "ADEXAM",
+    "esField": "aid_examiner.key",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "company"
+  },
+  {
+    "name": "pct申请号",
+    "type": "String",
+    "value": "pctAppNo",
+    "field": "PAN",
+    "esField": "pctappno",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "number"
+  },
+  {
+    "name": "pct申请日",
+    "type": "DateTime",
+    "value": "pctAppDate",
+    "field": "PAD",
+    "esField": "pctappdate",
+    "esClass": "dateQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "dateType"
+  },
+  {
+    "name": "pct进入日期",
+    "type": "DateTime",
+    "value": "pctEnterDate",
+    "field": "PED",
+    "esField": "pctenterdate",
+    "esClass": "dateQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "dateType"
+  },
+  {
+    "name": "pct公开号",
+    "type": "String",
+    "value": "pctPubNo",
+    "field": "PPN",
+    "esField": "pctpubno",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "number"
+  },
+  {
+    "name": "pct公开日",
+    "type": "DateTime",
+    "value": "pctPubDate",
+    "field": "PPD",
+    "esField": "pctpubdate",
+    "esClass": "dateQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "dateType"
+  },
+  {
+    "name": "wo指定国",
+    "type": "String",
+    "value": "wo",
+    "field": "WOC",
+    "esField": "wo",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "nation"
+  },
+  {
+    "name": "ep申请号",
+    "type": "String",
+    "value": "epNo",
+    "field": "EPNO",
+    "esField": "ep_no",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "number"
+  },
+  {
+    "name": "EP指定国",
+    "type": "String",
+    "value": "epCountry",
+    "field": "EPC",
+    "esField": "ep_country",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "nation"
+  },
+  {
+    "name": "ep申请日",
+    "type": "DateTime",
+    "value": "epDate",
+    "field": "EPD",
+    "esField": "ep_date",
+    "esClass": "dateQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true",
+    "groupBy": "dateType"
   },
   {
     "name": "自定义栏位id",