修改图谱模糊查询方法

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

@@ -180,7 +180,7 @@ public class RetrievalFacade {
         List<Integer> types = staticKnowledgeIndexVO.getTypes();
 
         //TODO 诊断
-        List<YiBaoDiseaseName> icdDiseaseList = icdDiseaseRepository.findByNameLike("*" + inputStr + "*");
+        List<YiBaoDiseaseName> icdDiseaseList = icdDiseaseRepository.findByNameContaining(inputStr);
         List<StaticKnowledgeIndexDTO> disRetList = Lists.newLinkedList();
         for (YiBaoDiseaseName icdDisease : icdDiseaseList) {
             StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
@@ -190,7 +190,7 @@ public class RetrievalFacade {
             disRetList.add(staticDTO);
         }
         //TODO 药品
-        List<Medicine> medicineList = medicineRepository.findByNameLike("*" + inputStr + "*");
+        List<Medicine> medicineList = medicineRepository.findByNameContaining(inputStr);
 
         List<StaticKnowledgeIndexDTO> drugRetList = Lists.newLinkedList();
         for (Medicine medicine : medicineList) {
@@ -201,7 +201,7 @@ public class RetrievalFacade {
             drugRetList.add(staticDTO);
         }
         //TODO 检验套餐
-        List<LisSet> lisSetList = lisSetRepository.findByNameLike("*" + inputStr + "*");
+        List<LisSet> lisSetList = lisSetRepository.findByNameContaining(inputStr);
 
         List<StaticKnowledgeIndexDTO> lisSetRetList = Lists.newLinkedList();
         for (LisSet lisSet : lisSetList) {
@@ -212,7 +212,7 @@ public class RetrievalFacade {
             lisSetRetList.add(staticDTO);
         }
         //TODO 检验明细关联出检验套餐
-        List<LisName> lisList = lisRepository.findByNameLike("*" + inputStr + "*");
+        List<LisName> lisList = lisRepository.findByNameContaining(inputStr);
 
         List<StaticKnowledgeIndexDTO> lisSetRelatecLisRetList = Lists.newLinkedList();
         for (LisName lis : lisList) {
@@ -228,7 +228,7 @@ public class RetrievalFacade {
             }
         }
         //TODO 检验明细
-        lisList = lisRepository.findByNameLike("*" + inputStr + "*");
+        lisList = lisRepository.findByNameContaining(inputStr);
 
         List<StaticKnowledgeIndexDTO> lisRetList = Lists.newLinkedList();
         for (LisName lis : lisList) {
@@ -239,7 +239,7 @@ public class RetrievalFacade {
             lisRetList.add(staticDTO);
         }
         //TODO 检查
-        List<PacsName> pacsList = pacsRepository.findByNameLike("*" + inputStr + "*");
+        List<PacsName> pacsList = pacsRepository.findByNameContaining(inputStr);
 
         List<StaticKnowledgeIndexDTO> pacsRetList = Lists.newLinkedList();
         for (PacsName pacs : pacsList) {
@@ -252,7 +252,7 @@ public class RetrievalFacade {
 
 
         //TODO 手术和操作
-        List<YiBaoOperationName> operationList = operationRepository.findByNameLike("*" + inputStr + "*");
+        List<YiBaoOperationName> operationList = operationRepository.findByNameContaining(inputStr);
 
         List<StaticKnowledgeIndexDTO> operationRetList = Lists.newLinkedList();
 

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface CombiOperationRepository extends Neo4jRepository<CombiOperation, Long> {
 
-    List<CombiOperation> findByNameLike(String name);
+    List<CombiOperation> findByNameContaining(String name);
 
     List<CombiOperation> findByNameIs(String name);
 }

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

@@ -165,7 +165,7 @@ public class LisNameNode {
 		List<LisDetailDTO> lislist = new ArrayList<>();
 		LisDetailDTO lisDetailDTO;
 
-		List<LisName> lislt = lisRepository.findByNameLike("*"+name+"*");
+		List<LisName> lislt = lisRepository.findByNameContaining(name);
 
 		for (LisName lis: lislt) {
 			lisDetailDTO = new LisDetailDTO();

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

@@ -11,7 +11,7 @@ public interface LisNameRepository extends Neo4jRepository<LisName, Long> {
 
     List<LisName> findByNameIs(String name);
 
-    List<LisName> findByNameLike(String name);
+    List<LisName> findByNameContaining(String name);
 
     @Query("MATCH (n:实验室检查) RETURN DISTINCT(KEYS(n))")
     List<List<String>> getKeys();

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

@@ -146,7 +146,7 @@ public class LisSetNode {
 
 		List<String> lispacklist = new ArrayList<>();
 
-		List<LisSet> lisSetlist = lisPackRepository.findByNameLike("*"+name+"*");
+		List<LisSet> lisSetlist = lisPackRepository.findByNameContaining(name);
 
 		for (LisSet lisSet : lisSetlist) {
 			nodename = lisSet.getName();

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

@@ -11,7 +11,7 @@ public interface LisSetRepository extends Neo4jRepository<LisSet, Long> {
 
     List<LisSet> findByNameIs(String name);
 
-    List<LisSet> findByNameLike(String name);
+    List<LisSet> findByNameContaining(String name);
 
     @Query("MATCH (n:实验室检查套餐) RETURN DISTINCT(KEYS(n))")
     List<List<String>> getKeys();

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

@@ -223,7 +223,7 @@ public class MedicineCodeNode {
         List<DrugInfoDTO> medslist = new ArrayList<>();
         DrugInfoDTO drugInfoDTO;
 
-        List<MedCodeName> medicines = medicineRepository.findByNameLike("*"+name+"*");
+        List<MedCodeName> medicines = medicineRepository.findByNameContaining(name);
 
         for (MedCodeName med : medicines) {
             drugInfoDTO = new DrugInfoDTO();

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

@@ -10,6 +10,6 @@ public interface MedicineCodeRepository extends Neo4jRepository<MedCodeName, Lon
 
     List<MedCodeName> findByNameIs(String name);
 
-    List<MedCodeName> findByNameLike(String name);
+    List<MedCodeName> findByNameContaining(String name);
 }
 

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

@@ -68,7 +68,7 @@ public class MedicineNode {
         List<DrugInfoDTO> medslist = new ArrayList<>();
         DrugInfoDTO drugInfoDTO;
 
-        List<Medicine> medicines = medicineRepository.findByNameLike("*"+name+"*");
+        List<Medicine> medicines = medicineRepository.findByNameContaining(name);
 
         for (Medicine med : medicines) {
             drugInfoDTO = new DrugInfoDTO();

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

@@ -11,6 +11,6 @@ public interface MedicineRepository extends Neo4jRepository<Medicine, Long> {
 
     List<Medicine> findByNameIs(String name);
 
-    List<Medicine> findByNameLike(String name);
+    List<Medicine> findByNameContaining(String name);
 }
 

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

@@ -172,7 +172,7 @@ public class PacsNameNode {
 
         List<String> pacslist = new ArrayList<>();
 
-        List<PacsName> pacslt = pacsRepository.findByNameLike("*"+name+"*");
+        List<PacsName> pacslt = pacsRepository.findByNameContaining(name);
 
         for (PacsName pacs : pacslt) {
             pacsname = pacs.getName();

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

@@ -1,6 +1,7 @@
 package com.diagbot.repository;
 
 import com.diagbot.entity.node.PacsName;
+import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 
 import java.util.List;
@@ -10,6 +11,6 @@ public interface PacsNameRepository extends Neo4jRepository<PacsName, Long> {
 
     List<PacsName> findByNameIs(String name);
 
-    List<PacsName> findByNameLike(String name);
+    List<PacsName> findByNameContaining(String name);
 }
 

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

@@ -91,7 +91,7 @@ public class PacsSubNameNode {
 
         List<String> pacslist = new ArrayList<>();
 
-        List<PacsSubName> pacslt = pacsRepository.findByNameLike("*"+name+"*");
+        List<PacsSubName> pacslt = pacsRepository.findByNameContaining(name);
 
         for (PacsSubName pacs : pacslt) {
             pacsname = pacs.getName();

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

@@ -10,6 +10,6 @@ public interface PacsSubNameRepository extends Neo4jRepository<PacsSubName, Long
 
     List<PacsSubName> findByNameIs(String name);
 
-    List<PacsSubName> findByNameLike(String name);
+    List<PacsSubName> findByNameContaining(String name);
 }
 

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

@@ -245,7 +245,7 @@ public class YiBaoDiseaseNode {
 
 		List<String> dislist = new ArrayList<>();
 
-		List<YiBaoDiseaseName> diseases = diseaseRepository.findByNameLike("*"+name+"*");
+		List<YiBaoDiseaseName> diseases = diseaseRepository.findByNameContaining(name);
 
 		for (YiBaoDiseaseName dis : diseases) {
 			icdname = dis.getName();

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

@@ -10,6 +10,6 @@ public interface YiBaoDiseaseRepository extends Neo4jRepository<YiBaoDiseaseName
 
     List<YiBaoDiseaseName> findByNameIs(String name);
 
-    List<YiBaoDiseaseName> findByNameLike(String name);
+    List<YiBaoDiseaseName> findByNameContaining(String name);
 }
 

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

@@ -159,7 +159,7 @@ public class YiBaoOperationNameNode {
         List<OperationInfoDTO> opslist = new ArrayList<>();
         OperationInfoDTO opInfoDTO;
 
-        List<YiBaoOperationName> operations = operationRepository.findByNameLike("*"+name+"*");
+        List<YiBaoOperationName> operations = operationRepository.findByNameContaining(name);
 
         for (YiBaoOperationName op : operations) {
             opInfoDTO = new OperationInfoDTO();

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

@@ -10,6 +10,6 @@ public interface YiBaoOperationNameRepository extends Neo4jRepository<YiBaoOpera
 
     List<YiBaoOperationName> findByNameIs(String name);
 
-    List<YiBaoOperationName> findByNameLike(String name);
+    List<YiBaoOperationName> findByNameContaining(String name);
 }