20230426曹老师要求合约查询保险人和被保险人 都查询出合约列表

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/CustomerApiController.java

@@ -257,20 +257,27 @@ public class CustomerApiController {
           }
           map.put("insuranceclaimthread",insuranceclaimthread);
 //合约信息
-
-          if("被保人".equals(custtype.trim())){
-              String  qSearch = "insuredscustid:"+scustid;
-              if( StringUtils.isNotEmpty(deptCode)){
-                  qSearch = "(insuredscustid:"+scustid+"%20AND%20policybelong:"+deptCode+")";
-              }
-              scriptRequest = new Request("GET", "/shanglifeecif.insurancearrangement/_search?size=100&pretty=true&sort=padate:asc&q="+qSearch);
-          }else{
-              String  qSearch = "applicantscustid:"+scustid;
+          logger.info("合约信息 投保人被保人类型："+custtype);
+//          if(custtype.trim().indexOf("被保人")!=-1){
+//              String  qSearch = "insuredscustid:"+scustid;
+//              if( StringUtils.isNotEmpty(deptCode)){
+//                  qSearch = "(insuredscustid:"+scustid+"%20AND%20policybelong:"+deptCode+")";
+//              }
+//              scriptRequest = new Request("GET", "/shanglifeecif.insurancearrangement/_search?size=100&pretty=true&sort=padate:asc&q="+qSearch);
+//          }else{
+//              String  qSearch = "applicantscustid:"+scustid;
+//              if( StringUtils.isNotEmpty(deptCode)){
+//                  qSearch = "(applicantscustid:"+scustid+"%20AND%20policybelong:"+deptCode+")";
+//              }
+//              scriptRequest = new Request("GET", "/shanglifeecif.insurancearrangement/_search?size=100&pretty=true&sort=padate:asc&q="+qSearch);
+//          }
+          //20230426曹老师要求合约查询保险人和被保险人 都查询出合约列表
+           String  qSearch = "(applicantscustid:"+scustid+"%20OR%insuredscustid:"+scustid+")";
               if( StringUtils.isNotEmpty(deptCode)){
-                  qSearch = "(applicantscustid:"+scustid+"%20AND%20policybelong:"+deptCode+")";
+                  qSearch = "(applicantscustid:"+scustid+"%20OR%insuredscustid:"+scustid+")"+"%20AND%20policybelong:"+deptCode+"";
               }
               scriptRequest = new Request("GET", "/shanglifeecif.insurancearrangement/_search?size=100&pretty=true&sort=padate:asc&q="+qSearch);
-          }
+
           logger.info("合约信息请求参数"+scriptRequest.getEndpoint());
 
           response = restClient.performRequest(scriptRequest);
@@ -1547,14 +1554,17 @@ public class CustomerApiController {
             builder.append("\"bool\":{");//boot开始
             builder.append("\"must\":[");//must开始
             //业绩归属字段
-            /*if(StringUtils.isNotEmpty(deptCode)){
-                builder.append("{\"prefix\":{\"policybelong\":\""+deptCode+"\"}},");
-            }*/
-
-            if(StringUtils.isNotEmpty(policybelong)){
-                builder.append("{\"prefix\":{\"policybelong\":\""+policybelong+"\"}},");
+//            if(StringUtils.isNotEmpty(deptCode)){
+//                builder.append("{\"prefix\":{\"salecom\":\""+deptCode+"\"}},");
+//            }else if(StringUtils.isNotEmpty(policybelong)){
+//                builder.append("{\"prefix\":{\"salecom\":\""+policybelong+"\"}},");
+//            }
+               // 渠道不为空的话按渠道筛选
+            if(StringUtils.isNotEmpty(deptCode)){
+                builder.append("{\"wildcard\":{\"salecom\":\"*"+deptCode+"*\"}},");
+            }else if(StringUtils.isNotEmpty(policybelong)){
+                builder.append("{\"wildcard\":{\"salecom\":\"*"+policybelong+"*\"}},");
             }
-
             //客户姓名
             if(StringUtils.isNotEmpty(name)){
                 builder.append("{\"wildcard\":{\"name\":\"*"+name+"*\"}},");
@@ -1658,10 +1668,7 @@ public class CustomerApiController {
                 builder.append("{\"prefix\":{\"label57\":\"最近一次理赔类型\"}},");
             }
 
-            // 渠道不为空的话按渠道筛选
-            if(StringUtils.isNotEmpty(deptCode)){
-                builder.append("{\"wildcard\":{\"salecom\":\"*"+deptCode+"*\"}},");
-            }
+
 
             if(StringUtils.isNotEmpty(gender) || StringUtils.isNotEmpty(NOVPolicy) || StringUtils.isNotEmpty(custtype)
                     || StringUtils.isNotEmpty(custclass) || StringUtils.isNotEmpty(sobirth) || StringUtils.isNotEmpty(SCustID)