Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/process/PushProcess.java

@@ -39,32 +39,7 @@ public class PushProcess {
         //生成push入参，供图谱调用
         NeoPushVO pushVO = commonFacade.generatePushInput(wordCrfDTO);
         Map<String, List<PushBaseDTO>> dis = new HashMap<>();
-        List<String> push = neoFacade.getPush(pushVO);
-        if (pushVO.getDiagVo() != null && ListUtil.isNotEmpty(pushVO.getDiagVo().getDiags())) {
-            List<String> collect = pushVO.getDiagVo().getDiags().stream().map(x -> x.getName()).collect(Collectors.toList());
-            push.removeAll(collect);
-            collect.addAll(push);
-            push = collect;
-        }
-        if (ListUtil.isNotEmpty(push)) {
-            //先把所有疾病推出来
-            if (ruleTypeList.contains("7")) {
-                List<PushBaseDTO> diseeases =  push.stream().map(x -> {
-                    PushBaseDTO pushBaseDTO = new PushBaseDTO();
-                    pushBaseDTO.setName(x);
-                    return pushBaseDTO;
-                }).collect(Collectors.toList());
-                diseeases = diseeases.subList(0, diseeases.size() >= length ? length : diseeases.size());
-                dis.put(DiseaseTypeEnum.possibleDis.getName(), diseeases);
-                pushDTO.setDis(dis);
-            }
-            //把第一个推送出来的诊断set到diagOrder中，再反推
-            setPushVo(pushVO, push);
-            //调用反推
-            reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO, dis);
-        }
-        return pushDTO;
-        /*//如果下的诊断有数据就反推
+        //如果下的诊断有数据就反推
         if (pushVO.getDiagVo() != null && ListUtil.isNotEmpty(pushVO.getDiagVo().getDiags())) {
             reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO, dis);
         } else {
@@ -89,7 +64,7 @@ public class PushProcess {
                 reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO, dis);
             }
         }
-        return pushDTO;*/
+        return pushDTO;
     }
 
     private void setPushVo(NeoPushVO pushVO, List<String> push) {

src/main/java/com/diagbot/util/CoreUtil.java

@@ -190,8 +190,15 @@ public class CoreUtil {
             String key = (String)field.get(object);
             if (value != null && value.get(key) != null) {
                 Field standField = getDeclaredField(object, standName) ;
-                standField.setAccessible(true) ;
-                standField.set(object, value.get(key));
+                standField.setAccessible(true);
+                if ("uniqueName".equals(standName)) {
+                    String uniqueName = (String)standField.get(object);
+                    if (StringUtil.isBlank(uniqueName)) {
+                        standField.set(object, value.get(key));
+                    }
+                } else {
+                    standField.set(object, value.get(key));
+                }
             }
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
@@ -267,7 +274,7 @@ public class CoreUtil {
      * @param item
      * @return
      */
-    public static Map compareNameWithNode(NodeNeoDTO nodeNeoDTO,  List<? extends Item> item) {
+    public static Map compareNameWithNode(NodeNeoDTO nodeNeoDTO, List<? extends Item> item) {
         Map<String, Object> map = new LinkedHashMap<>();
         boolean flag = false;
         if (ListUtil.isNotEmpty(item) && nodeNeoDTO != null) {