Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/entity/node/ICDDisease.java

@@ -13,7 +13,7 @@ import java.util.Set;
 @Setter
 @Getter
 //@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "医保ICD-10疾病")
+@NodeEntity(label = "医保ICD_10疾病")
 public class ICDDisease extends BaseNode  {
 
     @Property(name="医保ICD-10代码")
@@ -22,6 +22,9 @@ public class ICDDisease extends BaseNode  {
     @Property(name="疾病名称")
     private String othername;
 
+    @Property(name="静态知识")
+    private String knowledge;
+
     @Relationship(type="医保ICD-10疾病相关实验室检查", direction = Relationship.OUTGOING)
     private Set<LIS> liss_dis = new HashSet<>();
 

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -95,25 +95,36 @@ public class NeoFacade {
     }
 
     /**
-     * 图谱推送出来的数据
+     * 图谱反推的数据
      * @param pushVO
      * @return
      */
-    public List<NeoPushDTO> getPush(NeoPushVO pushVO){
+    public List<NeoPushDTO> getReversePush(NeoPushVO pushVO) {
         List<NeoPushDTO> neoPushDTOS = new ArrayList<>();
         List<String> diags = new ArrayList<>();
         // 如果有诊断名称，则通过诊断反推
-        // 如果没有诊断名称，则通过其它信息推送诊断
-        if (null!=pushVO.getDiagVo() && pushVO.getDiagVo().getDiags().size()>0) {
+        if (null != pushVO.getDiagVo() && pushVO.getDiagVo().getDiags().size() > 0) {
             for (Diag diag : pushVO.getDiagVo().getDiags()) {
                 diags.add(diag.getName());
             }
 
             neoPushDTOS = getDiagInfo(pushVO);
         }
-        else {
 
-        }
+        return neoPushDTOS;
+    }
+
+
+    /**
+     * 图谱正推的数据
+     * @param pushVO
+     * @return
+     */
+    public List<NeoPushDTO> getPush(NeoPushVO pushVO) {
+        List<NeoPushDTO> neoPushDTOS = new ArrayList<>();
+
+        // 如果没有诊断名称，则通过其它信息推送诊断
+
 
         return neoPushDTOS;
     }

src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -204,7 +204,7 @@ public class RetrievalFacade {
             StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
             staticDTO.setName(icdDisease.getName());
             staticDTO.setType(1);
-            staticDTO.setTypeName("医保ICD-10疾病");
+            staticDTO.setTypeName("医保ICD_10疾病");
             disRetList.add(staticDTO);
         }
         //TODO 药品