Преглед на файлове

Merge branch 'dev/20211117_2.1.4' into test

chengyao преди 3 години
родител
ревизия
4cb46e852f
променени са 1 файла, в които са добавени 6 реда и са изтрити 0 реда
  1. 6 0
      src/main/java/com/diagbot/facade/DataAnalysisFacade.java

+ 6 - 0
src/main/java/com/diagbot/facade/DataAnalysisFacade.java

@@ -361,6 +361,9 @@ public class DataAnalysisFacade {
             if("fileCode".equals(getEntryDefectImproveInnerVO.getAsc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getFileCode, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
             }
+            if("behospitalCode".equals(getEntryDefectImproveInnerVO.getAsc())){
+                behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getBehospitalCode, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
+            }
             if("age".equals(getEntryDefectImproveInnerVO.getAsc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getAge, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
             }
@@ -394,6 +397,9 @@ public class DataAnalysisFacade {
             if("fileCode".equals(getEntryDefectImproveInnerVO.getDesc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getFileCode, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
             }
+            if("behospitalCode".equals(getEntryDefectImproveInnerVO.getDesc())){
+                behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getBehospitalCode, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
+            }
             if("age".equals(getEntryDefectImproveInnerVO.getDesc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getAge, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
             }