Merge remote-tracking branch 'origin/master'

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

@@ -34,7 +34,7 @@ public class YiBaoDiseaseName extends BaseNode  {
 	private Set<YiBaoDiseaseNamePathwayName> yiBaoDiseaseNamePathwaynames = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关症状", direction = Relationship.OUTGOING)
-//	private Set<YiBaoDiseaseNameSymptom> yiBaoDiseaseNameSymptoms = new HashSet<>();
+	private Set<YiBaoDiseaseNameSymptom> yiBaoDiseaseNameSymptoms = new HashSet<>();
 	private Set<Symptom> Symptoms = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关体征", direction = Relationship.OUTGOING)

src/main/java/com/diagbot/entity/relationship/YiBaoDiseaseNameSymptom.java

@@ -7,7 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.*;
 
-@Deprecated
+//@Deprecated
 @Getter
 @Setter@RelationshipEntity(type = "医保疾病名称相关症状")
 public class YiBaoDiseaseNameSymptom extends BaseRelation {

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

@@ -9,6 +9,7 @@ import com.diagbot.dto.*;
 import com.diagbot.entity.DiseaseInfo;
 import com.diagbot.entity.DiseaseProperty;
 import com.diagbot.entity.node.LisRemind;
+import com.diagbot.entity.node.YiBaoDiseaseName;
 import com.diagbot.entity.relationship.LisRemindMedicine;
 import com.diagbot.entity.relationship.LisRemindYiBaoDiseaseName;
 import com.diagbot.enums.RedisEnum;
@@ -838,14 +839,16 @@ public class NeoFacade {
         YiBaoDiseaseNode icdDiseaseNode = new YiBaoDiseaseNode();
         String term;
         term = neoPushVO.getDiagVo().getDiags().get(0).getName();
-        /*List<YiBaoDiseaseName> yiBaoName = yiBaoDiseaseRepository.findByNameIs(term);
+        List<YiBaoDiseaseName> yiBaoName = yiBaoDiseaseRepository.findByNameIs(term);
+
         YiBaoDiseaseName icdDisease = null;
         if (ListUtil.isNotEmpty(yiBaoName)) {
             icdDisease = yiBaoName.get(0);
         }
         if (icdDisease != null) {
+            icdDisease = NeoUtil.extract_node(icdDisease);
             pushDTO = icdDiseaseNode.YiBaoDiseasetoDiseaseDTO(icdDisease, neoPushVO);
-        }*/
+        }
         pushDTO = this.reverseInfo(term);
 
         return pushDTO;

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

@@ -5,6 +5,7 @@ import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.entity.node.Vital;
 import com.diagbot.entity.node.YiBaoDiseaseName;
+import com.diagbot.entity.relationship.YiBaoDiseaseNameSymptom;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import com.diagbot.model.entity.PD;
 import com.diagbot.repository.Constants;
@@ -256,6 +257,17 @@ public class NeoUtil {
         }
     }
 
+
+    public static YiBaoDiseaseName extract_node(YiBaoDiseaseName yiBaoDiseaseName) {
+        for (YiBaoDiseaseNameSymptom symptom : yiBaoDiseaseName.getYiBaoDiseaseNameSymptoms()) {
+            if (isExist(symptom)) {
+                yiBaoDiseaseName.getSymptoms().add(symptom.getSymptom());
+            }
+        }
+
+        return yiBaoDiseaseName;
+    }
+
     public static void main(String[] args) {
         PD pd = new PD();
         pd.setValue("两月");