整理图谱实体和关系信息

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

@@ -17,6 +17,7 @@ import java.util.HashSet;
 @Setter
 @Getter
 @NodeEntity(label = "辅助检查名称子项目名称")
+@Deprecated
 public class PacsNameSubName extends BaseNode  {
 
 

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

@@ -7,8 +7,10 @@ import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.*;
 
+@Deprecated
 @Getter
-@Setter@RelationshipEntity(type = "辅助检查名称子项目名称禁忌疾病")
+@Setter
+@RelationshipEntity(type = "辅助检查名称子项目名称禁忌疾病")
 public class PacsNameSubNameDisease extends BaseRelation {
     @StartNode
     private PacsNameSubName pacsNameSubName;

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

@@ -7,8 +7,10 @@ import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.*;
 
+@Deprecated
 @Getter
-@Setter@RelationshipEntity(type = "辅助检查名称子项目名称禁忌性别")
+@Setter
+@RelationshipEntity(type = "辅助检查名称子项目名称禁忌性别")
 public class PacsNameSubNameGender extends BaseRelation {
     @StartNode
     private PacsNameSubName pacsNameSubName;

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

@@ -7,8 +7,10 @@ import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.*;
 
+@Deprecated
 @Getter
-@Setter@RelationshipEntity(type = "辅助检查名称子项目名称禁忌禁忌人群")
+@Setter
+@RelationshipEntity(type = "辅助检查名称子项目名称禁忌禁忌人群")
 public class PacsNameSubNameGroup extends BaseRelation {
     @StartNode
     private PacsNameSubName pacsNameSubName;

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

@@ -7,8 +7,10 @@ import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.*;
 
+@Deprecated
 @Getter
-@Setter@RelationshipEntity(type = "辅助检查名称子项目名称禁忌药物过敏原")
+@Setter
+@RelationshipEntity(type = "辅助检查名称子项目名称禁忌药物过敏原")
 public class PacsNameSubNameMedAllergen extends BaseRelation {
     @StartNode
     private PacsNameSubName pacsNameSubName;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.Allergen;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.ClinicalFinding;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.ConflictDevice;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.Disease;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.Gender;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.Group;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.Lis;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.MedAllergen;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.OralMedicine;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.relationship;
 
-import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.node.PacsDescribe;
+import com.diagbot.entity.node.PacsSubName;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -93,7 +93,7 @@ public class NeoFacade {
     @Value("${StandConvert.rate}")
     String standConvertRate;
     @Autowired
-    SymptomNameRepository symptomNameRepository;
+    SymptomRepository symptomRepository;
     @Autowired
     TransfusionRemindRepository transfusionRemindRepository;
     @Autowired
@@ -480,7 +480,7 @@ public class NeoFacade {
         //取交集
         symptoms.retainAll(symptomCache);
         long start = System.currentTimeMillis();
-        List<String> allDis_bySymptom = pushDisBySymptom(symptomNameRepository, symptoms);
+        List<String> allDis_bySymptom = pushDisBySymptom(symptomRepository, symptoms);
         long end = System.currentTimeMillis();
         return allDis_bySymptom;
     }
@@ -503,7 +503,7 @@ public class NeoFacade {
      * @param symptoms
      * @return
      */
-    public List<String> pushDisBySymptom(SymptomNameRepository symptomNameRepository, List<String> symptoms) {
+    public List<String> pushDisBySymptom(SymptomRepository symptomNameRepository, List<String> symptoms) {
         List<String> allDis = Lists.newArrayList();
         /*List<Symptom> byNameIn = symptomNameRepository.findByNameIn(symptoms);
         allDis = byNameIn.parallelStream()

src/main/java/com/diagbot/repository/AllergenRepository.java

@@ -0,0 +1,18 @@
+package com.diagbot.repository;
+
+import com.diagbot.entity.node.Allergen;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+
+import java.util.List;
+
+
+public interface AllergenRepository extends Neo4jRepository<Allergen, Long> {
+
+    List<Allergen> findByNameIs(String name);
+
+    List<Allergen> findByNameIn(List<String> names);
+
+    List<Allergen> findByNameContaining(String name);
+
+}
+

src/main/java/com/diagbot/repository/BaseNodeRepository.java

@@ -15,6 +15,9 @@ public interface BaseNodeRepository extends Neo4jRepository<BaseNode, Long> {
 
     List<BaseNode> findByNameIs(String name);
 
+    @Query("MATCH (n) WHERE n.name={name} RETURN n, LABELS(n) as Label")
+    List<Object> getNodesByName(@Param("name") String name);
+
     @Query("MATCH (n) RETURN DISTINCT(LABELS(n))")
     List<String> getLabels();
 

src/main/java/com/diagbot/repository/ClinicalFindingRepository.java

@@ -0,0 +1,20 @@
+package com.diagbot.repository;
+
+import com.diagbot.entity.node.ClinicalFinding;
+import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+
+public interface ClinicalFindingRepository extends Neo4jRepository<ClinicalFinding, Long> {
+
+    List<ClinicalFinding> findByNameIs(String name);
+
+    List<ClinicalFinding> findByNameIn(List<String> names);
+
+    List<ClinicalFinding> findByNameContaining(String name);
+
+}
+

src/main/java/com/diagbot/repository/LisFirstClassRepository.java

@@ -0,0 +1,24 @@
+package com.diagbot.repository;
+
+import com.diagbot.entity.node.LisFirstClass;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+
+public interface LisFirstClassRepository extends Neo4jRepository<LisFirstClass, Long> {
+
+    List<LisFirstClass> findByNameIs(String name);
+
+    List<LisFirstClass> findByNameContaining(String name);
+
+    List<LisFirstClass> findByNameIn(List<String> names);
+
+    Page<LisFirstClass> findByNameContainingIgnoreCaseOrPycodeContainingIgnoreCase(String name, String pycode, Pageable pageable);
+
+}
+

src/main/java/com/diagbot/repository/LisSecondClassRepository.java

@@ -0,0 +1,22 @@
+package com.diagbot.repository;
+
+import com.diagbot.entity.node.LisSecondClass;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+
+import java.util.List;
+
+
+public interface LisSecondClassRepository extends Neo4jRepository<LisSecondClass, Long> {
+
+    List<LisSecondClass> findByNameIs(String name);
+
+    List<LisSecondClass> findByNameContaining(String name);
+
+    List<LisSecondClass> findByNameIn(List<String> names);
+
+    Page<LisSecondClass> findByNameContainingIgnoreCaseOrPycodeContainingIgnoreCase(String name, String pycode, Pageable pageable);
+
+}
+

src/main/java/com/diagbot/repository/MedAllergenRepository.java

@@ -0,0 +1,18 @@
+package com.diagbot.repository;
+
+import com.diagbot.entity.node.MedAllergen;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+
+import java.util.List;
+
+
+public interface MedAllergenRepository extends Neo4jRepository<MedAllergen, Long> {
+
+    List<MedAllergen> findByNameIs(String name);
+
+    List<MedAllergen> findByNameIn(List<String> names);
+
+    List<MedAllergen> findByNameContaining(String name);
+
+}
+

src/main/java/com/diagbot/repository/SymptomNameRepository.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.query.Param;
 import java.util.List;
 
 
-public interface SymptomNameRepository extends Neo4jRepository<Symptom, Long> {
+public interface SymptomRepository extends Neo4jRepository<Symptom, Long> {
 
     List<Symptom> findByNameIs(String name);
 

src/main/java/com/diagbot/repository/VitalRepository.java

@@ -0,0 +1,21 @@
+package com.diagbot.repository;
+
+import com.diagbot.entity.node.Symptom;
+import com.diagbot.entity.node.Vital;
+import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+
+public interface VitalRepository extends Neo4jRepository<Vital, Long> {
+
+    List<Vital> findByNameIs(String name);
+
+    List<Vital> findByNameIn(List<String> names);
+
+    List<Vital> findByNameContaining(String name);
+
+}
+