zero 1 rok temu
rodzic
commit
5bc62d86a2

+ 1 - 1
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();

+ 88 - 2
src/main/resources/jsons/patent.json

@@ -169,6 +169,32 @@
     "defaultShowStats": "true"
   },
   {
+    "name": "标准申请人",
+    "type": "String",
+    "value": "standerApplicant",
+    "field": "SAT",
+    "esField": "stander_applicant.name.key",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "true",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "合并申请人",
+    "type": "String",
+    "value": "mergeApplicant",
+    "field": "MAT",
+    "esField": "merge_applicant.name.key",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "true",
+    "ifAsCondition": "true"
+  },
+  {
     "name": "发明人",
     "type": "Array",
     "value": "inventor",
@@ -195,6 +221,30 @@
     "ifAsCondition": "true"
   },
   {
+    "name": "标准权利人",
+    "type": "String",
+    "value": "standerRightHolder",
+    "field": "SRH",
+    "esField": "stander_right_holder.name.key",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "合并权利人",
+    "type": "String",
+    "value": "mergeRightHolder",
+    "field": "MRH",
+    "esField": "merge_right_holder.name.key",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
+  },
+  {
     "name": "公开说明书文本",
     "type": "String",
     "value": "publicFullText",
@@ -245,6 +295,42 @@
     "ifAsCondition": "true"
   },
   {
+    "name": "简单同族数量",
+    "type": "Integer",
+    "value": "simpleFamilyNum",
+    "field": "SFN",
+    "esField": "simple_family_num",
+    "esClass": "numberQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "inpadoc同族数量",
+    "type": "Integer",
+    "value": "inpadocFamilyNum",
+    "field": "IFN",
+    "esField": "inpadoc_family_num",
+    "esClass": "numberQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "扩展同族数量",
+    "type": "Integer",
+    "value": "patsnapFamilyNum",
+    "field": "PFN",
+    "esField": "patsnap_family_num",
+    "esClass": "numberQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
+  },
+  {
     "name": "引用专利数量",
     "type": "Integer",
     "value": "quotePatentNoNum",
@@ -585,7 +671,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -624,7 +710,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {