Browse Source

增加病历住院序号排序

chengyao 3 years ago
parent
commit
a29134c364
1 changed files with 6 additions and 0 deletions
  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())){
             if("fileCode".equals(getEntryDefectImproveInnerVO.getAsc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getFileCode, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
                 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())){
             if("age".equals(getEntryDefectImproveInnerVO.getAsc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getAge, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
                 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())){
             if("fileCode".equals(getEntryDefectImproveInnerVO.getDesc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getFileCode, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
                 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())){
             if("age".equals(getEntryDefectImproveInnerVO.getDesc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getAge, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalAnalysisDTO::getAge, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
             }
             }