fixed

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

@@ -378,14 +378,22 @@ public class EsPatentService {
                     kinDetailVO.setAppNo(familyPatent.getAppNo());
                     kinDetailVO.setPublicNo(familyPatent.getPublicNo());
                     kinDetailVO.setGrantNo(familyPatent.getGrantNo());
-                    PatentKinDTO kinDTO = this.selectPatentKindDetail(kinDetailVO, patentNo)
-                            .stream().findFirst().orElse(null);
-                    if (kinDTO != null) {
-                        kinDTOS.add(kinDTO);
+                    if (StringUtils.isNotEmpty(patentNo)) {
+                        PatentKinDTO kinDTO = this.selectPatentKindDetail(kinDetailVO, patentNo)
+                                .stream().findFirst().orElse(null);
+                        if (kinDTO != null) {
+                            kinDTOS.add(kinDTO);
+                        }
+                        break;
+                    } else {
+                        PatentKinDTO kinDTO = this.selectPatentKindDetail(kinDetailVO, patentNo)
+                                .stream().findFirst().orElse(null);
+                        if (kinDTO != null) {
+                            kinDTOS.add(kinDTO);
+                        }
                     }
                 }
             }
-
         }
         return kinDTOS;
     }
@@ -407,7 +415,7 @@ public class EsPatentService {
         if (StringUtils.isNotEmpty(patentNo)) {
             String str = "*";
             String s = str.concat(patentNo).concat("*");
-            Query query = QueryBuilders.wildcard(i -> i.field(patentNo).value(s));
+            Query query = QueryBuilders.wildcard(i -> i.field("patent_no.keyword").value(s));
             bool = QueryBuilders.bool(i -> i.should(q1, q2).must(query));
         } else {
             bool = QueryBuilders.bool(i -> i.should(q1, q2));