Browse Source

限制个数

gaodm 4 years ago
parent
commit
077888dc3a

+ 6 - 10
pom.xml

@@ -194,22 +194,18 @@
             <artifactId>spring-boot-starter-data-neo4j</artifactId>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.neo4j</groupId>
-            <artifactId>neo4j-ogm-core</artifactId>
-            <version>3.2.2</version>
-            <scope>compile</scope>
-        </dependency>
-
+        <!--<dependency>-->
+            <!--<groupId>org.neo4j</groupId>-->
+            <!--<artifactId>neo4j-ogm-core</artifactId>-->
+            <!--<version>3.2.2</version>-->
+            <!--<scope>compile</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-http-driver</artifactId>
-            <version>3.2.11</version>
         </dependency>
 
-
         <!-- 文件上传相关�?? -->
         <dependency>
             <groupId>commons-beanutils</groupId>

+ 12 - 5
src/main/java/com/diagbot/repository/YiBaoDiseaseNode.java

@@ -10,6 +10,9 @@ import com.diagbot.entity.node.YiBaoDiseaseName;
 import com.diagbot.entity.node.YiBaoICD_10Code;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.NeoPushVO;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -252,12 +255,16 @@ public class YiBaoDiseaseNode {
 		List<String> dislist = new ArrayList<>();
 		List<DiseaseInfoDTO> diseaseInfoDTOList = new ArrayList<>();
 
-		List<YiBaoDiseaseName> diseases = diseaseRepository.findByNameContainingOrPycodeContaining(name, name);
-		//diseases.addAll(baseNodeRepository.getYiBaoDiseasebyPinYin(name));
+//		List<YiBaoDiseaseName> diseases = diseaseRepository.findByNameContainingOrPycodeContaining(name, name);
+//		//diseases.addAll(baseNodeRepository.getYiBaoDiseasebyPinYin(name));
+//
+//		if (ListUtil.isNotEmpty(diseases) && diseases.size() > 100) {
+//			diseases = diseases.subList(0, 100);
+//		}
 
-		if (ListUtil.isNotEmpty(diseases) && diseases.size() > 100) {
-			diseases = diseases.subList(0, 100);
-		}
+        Pageable pageable = PageRequest.of(0, 10);
+        Page<YiBaoDiseaseName> diseasesPage = diseaseRepository.findByNameContainingIgnoreCaseOrPycodeContainingIgnoreCase(name, name, pageable);
+        List<YiBaoDiseaseName> diseases = diseasesPage.getContent();
 
 		for (YiBaoDiseaseName dis : diseases) {
 			icdname = dis.getName();

+ 4 - 0
src/main/java/com/diagbot/repository/YiBaoDiseaseRepository.java

@@ -1,6 +1,8 @@
 package com.diagbot.repository;
 
 import com.diagbot.entity.node.YiBaoDiseaseName;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 
 import java.util.List;
@@ -16,6 +18,8 @@ public interface YiBaoDiseaseRepository extends Neo4jRepository<YiBaoDiseaseName
 
     List<YiBaoDiseaseName> findByNameContainingOrPycodeContaining(String name, String pycode);
 
+    Page<YiBaoDiseaseName> findByNameContainingIgnoreCaseOrPycodeContainingIgnoreCase(String name, String pycode, Pageable pageable);
+
     List<YiBaoDiseaseName> findTop100ByNameContainingOrPycodeContaining(String name, String pycode);
 }