更新所有术语查询的返回数量定义

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

@@ -78,28 +78,28 @@ public class RetrievalFacade {
         RetrievalDTO retrievalDTO = new RetrievalDTO();
         switch (retrievalVO.getType()) {
             case 1:
-                retrievalDTO.setLisNames(getLisPacks(retrievalVO.getInputStr()));
+                retrievalDTO.setLisNames(getLisPacks(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
             case 2:
-                retrievalDTO.setLisDetailNames(getLis(retrievalVO.getInputStr()));
+                retrievalDTO.setLisDetailNames(getLis(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
             case 3:
-                retrievalDTO.setPacsNames(getPACSs(retrievalVO.getInputStr()));
+                retrievalDTO.setPacsNames(getPACSs(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
             case 4:
-                retrievalDTO.setDiseaseNames(getDiseases(retrievalVO.getInputStr()));
+                retrievalDTO.setDiseaseNames(getDiseases(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
             case 5:
-                retrievalDTO.setDrugNames(getMedicines(retrievalVO.getInputStr()));
+                retrievalDTO.setDrugNames(getMedicines(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
             case 6:
-                retrievalDTO.setOperationNames(getOperations(retrievalVO.getInputStr()));
+                retrievalDTO.setOperationNames(getOperations(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
             case 7:
-                retrievalDTO.setDeptNames(getDepts(retrievalVO.getInputStr()));
+                retrievalDTO.setDeptNames(getDepts(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
             case 8:
-                retrievalDTO.setTransfusionNames(getTransfusion(retrievalVO.getInputStr()));
+                retrievalDTO.setTransfusionNames(getTransfusion(retrievalVO.getInputStr(), retrievalVO.getSize()));
                 break;
             case 9:
                 retrievalDTO.setSymptomNames(getSymptoms(retrievalVO.getInputStr(), retrievalVO.getSize()));
@@ -113,10 +113,10 @@ public class RetrievalFacade {
     /*
      * 获取化验套餐名称列表
      */
-    public List<String> getLisPacks(String info) {
+    public List<String> getLisPacks(String info, Integer size) {
 
         LisSetNode lisPackNode = new LisSetNode();
-        List<String> lisPacklist = lisPackNode.getLISPackNameList(info, lisSetRepository, baseNodeRepository);
+        List<String> lisPacklist = lisPackNode.getLISPackNameList(info, size, lisSetRepository, baseNodeRepository);
 
         return lisPacklist;
     }
@@ -125,10 +125,10 @@ public class RetrievalFacade {
     /*
      * 获取化验细项名称列表
      */
-    public List<LisDetailDTO> getLis(String info) {
+    public List<LisDetailDTO> getLis(String info, Integer size) {
 
         LisNameNode lisNode = new LisNameNode();
-        List<LisDetailDTO> lislist = lisNode.getLisDetailList(info, lisRepository, baseNodeRepository);
+        List<LisDetailDTO> lislist = lisNode.getLisDetailList(info, size, lisRepository, baseNodeRepository);
 
         return lislist;
     }
@@ -137,10 +137,10 @@ public class RetrievalFacade {
     /*
      * 获取辅检名称列表
      */
-    public List<String> getPACSs(String info) {
+    public List<String> getPACSs(String info, Integer size) {
 
         PacsNameNode pacsNode = new PacsNameNode();
-        List<String> pacslist = pacsNode.getPACSNameAndPACSSubNameList(info, pacsRepository);
+        List<String> pacslist = pacsNode.getPACSNameAndPACSSubNameList(info, size, pacsRepository);
 
         return pacslist;
     }
@@ -149,10 +149,10 @@ public class RetrievalFacade {
     /*
      * 获取疾病名称列表
      */
-    public List<DiseaseInfoDTO> getDiseases(String info) {
+    public List<DiseaseInfoDTO> getDiseases(String info, Integer size) {
 
         YiBaoDiseaseNode yiBaoDiseaseNode = new YiBaoDiseaseNode();
-        List<DiseaseInfoDTO> diseaselist = yiBaoDiseaseNode.getDiseaseNameList(info, icdDiseaseRepository, baseNodeRepository);
+        List<DiseaseInfoDTO> diseaselist = yiBaoDiseaseNode.getDiseaseNameList(info, size, icdDiseaseRepository, baseNodeRepository);
 
         return diseaselist;
     }
@@ -161,10 +161,10 @@ public class RetrievalFacade {
     /*
      * 获取药品商品名称列表
      */
-    public List<DrugInfoDTO> getMedicines(String info) {
+    public List<DrugInfoDTO> getMedicines(String info, Integer size) {
 
         MedicineNode medicineNode = new MedicineNode();
-        List<DrugInfoDTO> medslist = medicineNode.getMedicineList(info, medicineRepository, baseNodeRepository);
+        List<DrugInfoDTO> medslist = medicineNode.getMedicineList(info, size, medicineRepository, baseNodeRepository);
 
         return medslist;
     }
@@ -173,10 +173,10 @@ public class RetrievalFacade {
     /*
      * 获取手术和操作名称列表
      */
-    public List<OperationInfoDTO> getOperations(String info) {
+    public List<OperationInfoDTO> getOperations(String info, Integer size) {
 
         YiBaoOperationNameNode operationNode = new YiBaoOperationNameNode();
-        List<OperationInfoDTO> opslist = operationNode.getOperationList(info, operationRepository, baseNodeRepository);
+        List<OperationInfoDTO> opslist = operationNode.getOperationList(info, size, operationRepository, baseNodeRepository);
 
         return opslist;
     }
@@ -185,7 +185,7 @@ public class RetrievalFacade {
     /*
      * 获取输血方式列表
      */
-    public List<String> getTransfusion(String info) {
+    public List<String> getTransfusion(String info, Integer size) {
         List<String> transfusionNames = transfusionRemindRepository.findTransfusionByName(info);
 
         return transfusionNames;
@@ -195,10 +195,10 @@ public class RetrievalFacade {
     /*
      * 获取科室名称列表
      */
-    public List<String> getDepts(String name) {
+    public List<String> getDepts(String name, Integer size) {
 
         DeptNode deptNode = new DeptNode();
-        List<String> deptlist = deptNode.getDeptNameList(name, deptRepository, baseNodeRepository);
+        List<String> deptlist = deptNode.getDeptNameList(name, size, deptRepository, baseNodeRepository);
 
         return deptlist;
     }

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

@@ -11,12 +11,16 @@ public class DeptNode {
     /**
      * 获取科室名称列表
      */
-    public List<String> getDeptNameList(String name, DeptRepository deptRepository, BaseNodeRepository baseNodeRepository) {
+    public List<String> getDeptNameList(String name, Integer size, DeptRepository deptRepository, BaseNodeRepository baseNodeRepository) {
         List<String> deptlt = new ArrayList<>();
-        List<Dept> deptlist = deptRepository.index(name, name, 100);
+        if (null == size) {
+            size = 100;
+        }
+
+        List<Dept> deptlist = deptRepository.index(name, name, size);
 
-        if (ListUtil.isNotEmpty(deptlist) && deptlist.size() > 100) {
-            deptlist = deptlist.subList(0, 100);
+        if (ListUtil.isNotEmpty(deptlist) && deptlist.size() > size) {
+            deptlist = deptlist.subList(0, size);
         }
 
         for (Dept dept : deptlist) {

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

@@ -182,17 +182,20 @@ public class LisNameNode {
 	/**
 	 * 获取化验细项名称列表
 	 */
-	public List<LisDetailDTO> getLisDetailList(String name, LisNameRepository lisRepository, BaseNodeRepository baseNodeRepository) {
+	public List<LisDetailDTO> getLisDetailList(String name, Integer size, LisNameRepository lisRepository, BaseNodeRepository baseNodeRepository) {
 		String nodename, unit;
 		Double min, max;
 
 		List<LisDetailDTO> lislist = new ArrayList<>();
 		LisDetailDTO lisDetailDTO;
+		if (null == size) {
+			size = 100;
+		}
 
-		List<LisName> lislt = lisRepository.index(name, name,100);
+		List<LisName> lislt = lisRepository.index(name, name,size);
 
-		if (ListUtil.isNotEmpty(lislt) && lislt.size() > 100) {
-			lislt = lislt.subList(0, 100);
+		if (ListUtil.isNotEmpty(lislt) && lislt.size() > size) {
+			lislt = lislt.subList(0, size);
 		}
 
 		for (LisName lis : lislt) {

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

@@ -158,15 +158,19 @@ public class LisSetNode {
 	/**
 	 * 获取化验套餐名称列表
 	 */
-	public List<String> getLISPackNameList(String name, LisSetRepository lisPackRepository, BaseNodeRepository baseNodeRepository) {
+	public List<String> getLISPackNameList(String name, Integer size, LisSetRepository lisPackRepository, BaseNodeRepository baseNodeRepository) {
 		String nodename;
 
 		List<String> lispacklist = new ArrayList<>();
 
-		List<LisSet> lisSetlist = lisPackRepository.index(name, name, 100);
+		if (null == size) {
+			size = 100;
+		}
+
+		List<LisSet> lisSetlist = lisPackRepository.index(name, name, size);
 
-		if (ListUtil.isNotEmpty(lisSetlist) && lisSetlist.size() > 100) {
-			lisSetlist = lisSetlist.subList(0, 100);
+		if (ListUtil.isNotEmpty(lisSetlist) && lisSetlist.size() > size) {
+			lisSetlist = lisSetlist.subList(0, size);
 		}
 
 		for (LisSet lisSet : lisSetlist) {

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

@@ -146,16 +146,19 @@ public class MedicineNode {
     /**
      * 获取药品商品名称列表
      */
-    public List<DrugInfoDTO> getMedicineList(String name, MedicineRepository medicineRepository, BaseNodeRepository baseNodeRepository) {
+    public List<DrugInfoDTO> getMedicineList(String name, Integer size, MedicineRepository medicineRepository, BaseNodeRepository baseNodeRepository) {
         String nodename;
 
         List<DrugInfoDTO> medslist = new ArrayList<>();
         DrugInfoDTO drugInfoDTO;
+        if (null == size) {
+            size = 100;
+        }
 
-        List<Medicine> medicines = medicineRepository.index(name, name, 100);
+        List<Medicine> medicines = medicineRepository.index(name, name, size);
 
-        if (ListUtil.isNotEmpty(medicines) && medicines.size() > 100) {
-            medicines = medicines.subList(0, 100);
+        if (ListUtil.isNotEmpty(medicines) && medicines.size() > size) {
+            medicines = medicines.subList(0, size);
         }
 
         for (Medicine med : medicines) {

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

@@ -256,13 +256,16 @@ public class PacsNameNode {
     /**
      * 获取辅检名称列表
      */
-    public List<String> getPACSNameAndPACSSubNameList(String name, PacsNameRepository pacsRepository) {
+    public List<String> getPACSNameAndPACSSubNameList(String name, Integer size, PacsNameRepository pacsRepository) {
 
         List<String> pacslist = new ArrayList<>();
-        List<BaseNodeInfo> pacslt = pacsRepository.indexMultipleLabel(name, name, 100);
+        if (null == size) {
+            size = 100;
+        }
+        List<BaseNodeInfo> pacslt = pacsRepository.indexMultipleLabel(name, name, size);
 
-        if (ListUtil.isNotEmpty(pacslt) && pacslt.size() > 100) {
-            pacslt = pacslt.subList(0, 100);
+        if (ListUtil.isNotEmpty(pacslt) && pacslt.size() > size) {
+            pacslt = pacslt.subList(0, size);
         }
 
         pacslist = pacslt.stream().map(i -> i.getName()).collect(Collectors.toList());

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

@@ -281,16 +281,19 @@ public class YiBaoDiseaseNode {
 	/**
 	 * 获取疾病名称列表
 	 */
-	public List<DiseaseInfoDTO> getDiseaseNameList(String name, YiBaoDiseaseNameRepository diseaseRepository, BaseNodeRepository baseNodeRepository) {
+	public List<DiseaseInfoDTO> getDiseaseNameList(String name, Integer size, YiBaoDiseaseNameRepository diseaseRepository, BaseNodeRepository baseNodeRepository) {
 		String icdname;
 
 		List<String> dislist = new ArrayList<>();
 		List<DiseaseInfoDTO> diseaseInfoDTOList = new ArrayList<>();
+		if (null == size) {
+			size = 100;
+		}
 
-		List<YiBaoDiseaseName> diseases = diseaseRepository.index(name, name, 100);
+		List<YiBaoDiseaseName> diseases = diseaseRepository.index(name, name, size);
 
-		if (ListUtil.isNotEmpty(diseases) && diseases.size() > 100) {
-			diseases = diseases.subList(0, 100);
+		if (ListUtil.isNotEmpty(diseases) && diseases.size() > size) {
+			diseases = diseases.subList(0, size);
 		}
 
 		for (YiBaoDiseaseName dis : diseases) {

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

@@ -220,16 +220,20 @@ public class YiBaoOperationNameNode {
     /**
      * 获取手术操作名称列表
      */
-    public List<OperationInfoDTO> getOperationList(String name, YiBaoOperationNameRepository operationRepository, BaseNodeRepository baseNodeRepository) {
+    public List<OperationInfoDTO> getOperationList(String name, Integer size, YiBaoOperationNameRepository operationRepository, BaseNodeRepository baseNodeRepository) {
         String nodename;
 
         List<OperationInfoDTO> opslist = new ArrayList<>();
         OperationInfoDTO opInfoDTO;
 
-        List<YiBaoOperationName> operations = operationRepository.index(name, name, 100);
+        if (null == size) {
+            size = 100;
+        }
+
+        List<YiBaoOperationName> operations = operationRepository.index(name, name, size);
 
-        if (ListUtil.isNotEmpty(operations) && operations.size() > 100) {
-            operations = operations.subList(0, 100);
+        if (ListUtil.isNotEmpty(operations) && operations.size() > size) {
+            operations = operations.subList(0, size);
         }
 
         for (YiBaoOperationName op : operations) {