医生姓名字段兼容处理

src/main/java/com/diagbot/dto/BehospitalInfoDTO.java

@@ -33,6 +33,8 @@ public class BehospitalInfoDTO implements Serializable {
     @Excel(name = "主管医生", orderNum = "2")
     private String doctorName;
 
+
+    private String behDoctorName;
     /**
      * 姓名
      */
@@ -134,7 +136,7 @@ public class BehospitalInfoDTO implements Serializable {
 
     private String directorDoctorName;
 
-    private String behDoctorName;
+
 
     /**
      * 归档时间

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

@@ -338,11 +338,9 @@ public class DataAnalysisFacade {
         if(StringUtils.isNotBlank(getEntryDefectImproveInnerVO.getAsc())){
             if("behDeptName".equals(getEntryDefectImproveInnerVO.getAsc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalInfoDTO::getBehDeptName, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
-
             }
-            if("doctorName".equals(getEntryDefectImproveInnerVO.getAsc())){
+            if("behDoctorName".equals(getEntryDefectImproveInnerVO.getAsc()) || "doctorName".equals(getEntryDefectImproveInnerVO.getAsc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalInfoDTO::getDoctorName, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
-
             }
             if("name".equals(getEntryDefectImproveInnerVO.getAsc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalInfoDTO::getName, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
@@ -373,11 +371,9 @@ public class DataAnalysisFacade {
         if(StringUtils.isNotBlank(getEntryDefectImproveInnerVO.getDesc())){
             if("behDeptName".equals(getEntryDefectImproveInnerVO.getDesc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalInfoDTO::getBehDeptName, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
-
             }
-            if("doctorName".equals(getEntryDefectImproveInnerVO.getDesc())){
+            if("behDoctorName".equals(getEntryDefectImproveInnerVO.getDesc()) || "doctorName".equals(getEntryDefectImproveInnerVO.getDesc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalInfoDTO::getDoctorName, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
-
             }
             if("name".equals(getEntryDefectImproveInnerVO.getDesc())){
                 behospitalInfoDTOList = behospitalInfoDTOList.stream().sorted(Comparator.comparing(BehospitalInfoDTO::getName, Comparator.nullsLast(String::compareTo)).reversed()).collect(Collectors.toList());
@@ -567,6 +563,7 @@ public class DataAnalysisFacade {
         behospitalInfoDTO.setBehospitalDate(behospitalCodeDetail.getBehospitalDate());
         behospitalInfoDTO.setLeaveHospitalDate(behospitalCodeDetail.getLeaveHospitalDate());
         behospitalInfoDTO.setDoctorName(behospitalCodeDetail.getDoctorName());
+        behospitalInfoDTO.setBehDoctorName(behospitalCodeDetail.getDoctorName());
         behospitalInfoDTO.setBehDeptName(entryDefectImproveInner.getBehDeptName());
         behospitalInfoDTO.setGradeTime(behospitalCodeDetail.getGradeTime());
         behospitalInfoDTOS.add(behospitalInfoDTO);