Merge remote-tracking branch 'origin/push-dev-diagnose' into push-test

graphdb/src/main/java/org/diagbot/repository/DiseaseRepository.java

@@ -50,6 +50,9 @@ public interface DiseaseRepository extends Neo4jRepository<Disease, Long> {
     //删除排除关系10
     @Query("match(c:Condition) where c.name={0} detach delete c")
     void deleteRelation10(String conditionName);
+    //删除诊断
+    @Query("match(c:Disease) where c.disId={0} detach delete c")
+    void deleteRelation11(Long disId);
     //更新图谱
     //存储疾病
     @Query("merge(d:Disease{name:{0},disId:{1},emergency:{2}})")

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -2069,10 +2069,12 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
             diseaseRepository.deleteRelation3(disId);
             diseaseRepository.deleteRelation4(disId);
 //            diseaseRepository.deleteRelation5(disId);
-            diseaseRepository.deleteRelation6(disId);
-            diseaseRepository.deleteRelation7(disId);
-            diseaseRepository.deleteRelation8(disId);
-            diseaseRepository.deleteRelation9(disId);
+//            diseaseRepository.deleteRelation6(disId);
+//            diseaseRepository.deleteRelation7(disId);
+//            diseaseRepository.deleteRelation8(disId);
+//            diseaseRepository.deleteRelation9(disId);
+            //删除disId
+            diseaseRepository.deleteRelation11(disId);
             List<String> allCode = this.getAllCode(disId);
             if(allCode.size()>0){
                 for (String conName:allCode) {