客户详情接口完善

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

@@ -363,8 +363,10 @@ public class CustomerApiController {
             JSONObject jsonObject = JSON.parseObject(result);
             Map mpInfo = new HashMap();
           String indid = jsonObject.getString("_id");
+
           mpInfo.put("id",indid);
           JSONObject source = JSON.parseObject(jsonObject.getString("_source"));
+          String scustid = source.getString("scustid");
           mpInfo.putAll(JSON.parseObject(jsonObject.getString("_source"),Map.class));
             //mpInfo.put("birthday",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",JSON.parseObject(jsonObject.getString("_source")).getDate("birthday")));
             if(mpInfo.containsKey("birthday")){
@@ -398,7 +400,7 @@ public class CustomerApiController {
             map.put("relationship",relationship);
           query  =new HashMap();
           query.put("applicantid",indid);
-          scriptRequest = new Request("GET", "/shanglifeecif.insuranceclaimthread/_search?pretty=true&q=applicantid:"+indid);
+          scriptRequest = new Request("GET", "/shanglifeecif.insuranceclaimthread/_search?pretty=true&q=lpid:"+scustid);
 
           response = restClient.performRequest(scriptRequest);
 //          response= restClient.performRequest("GET", "/shanglifeecif.insuranceclaimthread/_search",Collections.<String, String>emptyMap(),entity);
@@ -418,7 +420,7 @@ public class CustomerApiController {
 
           query  =new HashMap();
           query.put("applicantid",indid);
-          scriptRequest = new Request("GET", "/shanglifeecif.insurancearrangement/_search?pretty=true&q=applicantid:"+indid);
+          scriptRequest = new Request("GET", "/shanglifeecif.insurancearrangement/_search?pretty=true&q=applicantscustid:"+scustid);
 
           response = restClient.performRequest(scriptRequest);
           result = EntityUtils.toString(response.getEntity());
@@ -463,6 +465,7 @@ public class CustomerApiController {
             String indid = jsonObject.getString("_id");
             mpInfo.put("id",indid);
             JSONObject source = JSON.parseObject(jsonObject.getString("_source"));
+            String scustid = jsonObject.getString("scustid");
             mpInfo.putAll(JSON.parseObject(jsonObject.getString("_source"),Map.class));
             //mpInfo.put("birthday",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",JSON.parseObject(jsonObject.getString("_source")).getDate("birthday")));
             if(mpInfo.containsKey("birthday")){
@@ -475,7 +478,7 @@ public class CustomerApiController {
             Map query  =new HashMap();
             query.put("applicantid",indid);
             HttpEntity entity = new NStringEntity(EsJsonUtil.QuerygetMust(query), ContentType.APPLICATION_JSON);
-            scriptRequest = new Request("GET", "/shanglifeecif.insurancearrangement/_search?pretty=true&q=applicantid:"+indid);
+            scriptRequest = new Request("GET", "/shanglifeecif.insurancearrangement/_search?pretty=true&q=applicantscustid:"+scustid);
 
             response = restClient.performRequest(scriptRequest);
 //            response= restClient.performRequest("GET", "/shanglifeecif.insurancearrangement/_search",Collections.<String, String>emptyMap(),entity);
@@ -521,7 +524,7 @@ public class CustomerApiController {
             map.put("lineBarChartData",lineBarChartData);
             query  =new HashMap();
             query.put("applicantid",indid);
-            scriptRequest = new Request("GET", "/shanglifeecif.insuranceclaimthread/_search?pretty=true&q=applicantid:"+indid);
+            scriptRequest = new Request("GET", "/shanglifeecif.insuranceclaimthread/_search?pretty=true&q=lpid:"+scustid);
 
             response = restClient.performRequest(scriptRequest);
             result = EntityUtils.toString(response.getEntity());