Browse Source

修复会员列表详情展示会员查询错误问题

auqfypeu 4 years ago
parent
commit
e31573cbc0

+ 0 - 3
member-services/src/main/java/com/liangjian/dataplatform/member/service/impl/MemberListService.java

@@ -59,9 +59,6 @@ public class MemberListService implements IMemberListService {
                         if (list == null) {
                             list = new ArrayList<FiltersUtils>();
                         }
-                        else {
-                            filter = null;//空字段
-                        }
                         List<Map<String, Object>> rulesList = filter.getRules();
                         if(null != rulesList && rulesList.size() > 0){
                             Map<String, Object> rulesMap = rulesList.get(0);

+ 6 - 2
member-services/src/main/java/com/liangjian/dataplatform/member/service/impl/MemberextsService.java

@@ -72,7 +72,7 @@ public class MemberextsService implements IMemberextsService {
                 SearchHit searchHit1 = searchHit[i];
                 Map<String, Object> source = searchHit1.getSourceAsMap();
 
-                String patientPhone = source.get("PatientPhone").toString();
+                String patientPhone = source.get("MemUsualPhone").toString();
                 Map<String, Object> patientPhoneMap  = memDataDictoryRepository.desDecryptFixKey(patientPhone);// 号码解密.
                 patientPhone = (String)patientPhoneMap.get("phone");
                 if(!StringUtil.isEmpty(patientPhone)){
@@ -84,7 +84,11 @@ public class MemberextsService implements IMemberextsService {
                 itemsMap.put("PatientWeight",source.get("PatientWeight"));
                 itemsMap.put("PatientGender",source.get("PatientGender"));
                 itemsMap.put("PatientId",source.get("PatientId"));
-                itemsMap.put("PatientPhone",patientPhone);
+                itemsMap.put("MemberGender",source.get("MemberGender"));
+                itemsMap.put("MemEmail",source.get("MemEmail"));
+                itemsMap.put("MemberNickName",source.get("MemberNickName"));
+                itemsMap.put("MemUsualAddress",source.get("MemUsualAddress"));
+                itemsMap.put("MemUsualPhone",patientPhone);
                 itemsMap.put("PatientName",source.get("PatientName"));
                 itemsMap.put("PatientHeight",source.get("PatientHeight"));
                 itemsMap.put("PatientAge",source.get("PatientAge"));