多诊断以，分隔

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

@@ -907,9 +907,9 @@ public class ConsoleByDeptFacade {
         IPage<ReBeHosMergeDTO> page = behospitalInfoFacade.reHos31DaysPageByDept(reBeHosPageVO);
         List<ReBeHosMergeDTO> records = page.getRecords();
         IPage<ReBeHosByDeptDTO> retPage = new Page<>();
-        BeanUtil.copyProperties(page, retPage);
-        List<ReBeHosByDeptDTO> retRecords = Lists.newLinkedList();
         if (ListUtil.isNotEmpty(records)) {
+            List<ReBeHosByDeptDTO> retRecords = Lists.newLinkedList();
+            BeanUtil.copyProperties(page, retPage);
             Iterator<ReBeHosMergeDTO> iterator = records.iterator();
             while(iterator.hasNext()){
                 ReBeHosMergeDTO record = iterator.next();
@@ -943,7 +943,7 @@ public class ConsoleByDeptFacade {
                 retRecord.setDetails(details);
                 retRecords.add(retRecord);
             }
-        }
+
         if(reBeHosPageVO.getFlag()==1){
             size = retRecords.size();
         }
@@ -964,6 +964,7 @@ public class ConsoleByDeptFacade {
             }
         }
         retPage.setRecords(retRecords);
+        }
         return retPage;
     }
 

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

@@ -3009,9 +3009,9 @@ public class ConsoleFacade {
         IPage<ReBeHosMergeDTO> page = behospitalInfoFacade.reHos31DaysPage(reBeHosPageVO);
         List<ReBeHosMergeDTO> records = page.getRecords();
         IPage<ReBeHosDTO> retPage = new Page<>();
-        BeanUtil.copyProperties(page, retPage);
-        List<ReBeHosDTO> retRecords = Lists.newLinkedList();
         if (ListUtil.isNotEmpty(records)) {
+            BeanUtil.copyProperties(page, retPage);
+            List<ReBeHosDTO> retRecords = Lists.newLinkedList();
             Iterator<ReBeHosMergeDTO> iterator = records.iterator();
             while(iterator.hasNext()){
                 ReBeHosMergeDTO record = iterator.next();
@@ -3045,7 +3045,6 @@ public class ConsoleFacade {
                 retRecord.setDetails(details);
                 retRecords.add(retRecord);
             }
-        }
         if(reBeHosPageVO.getFlag()==1){
             size = retRecords.size();
         }
@@ -3066,21 +3065,21 @@ public class ConsoleFacade {
             }
         }
         retPage.setRecords(retRecords);
+        }
         return retPage;
     }
 
 
    static Boolean isContainDiagnose(ReBeHosMergeDTO record){
+        //切成最小单元进行诊断匹配
         String lastDiagnoseName = replace(record.getLastDiagnoseName());
         String diagnose =replace(record.getDiagnose());
+        //对入院诊断多个诊断，分割
         String lastDiagnose = replace(record.getLastDiagnose());
-        String diagnoseName =replace(record.getDiagnoseName());
-        record.setLastDiagnoseName(lastDiagnoseName);
         record.setDiagnose(diagnose);
         record.setLastDiagnose(lastDiagnose);
-        record.setDiagnoseName(diagnoseName);
-        Set lastDiagnoseNames = strTranListMethod(record.getLastDiagnoseName());
-        Set diagnoses = strTranListMethod(record.getDiagnose());
+        Set lastDiagnoseNames = strTranListMethod(lastDiagnoseName);
+        Set diagnoses = strTranListMethod(diagnose);
         long count = diagnoses.stream().filter(obj ->null != lastDiagnoseNames && null != obj && lastDiagnoseNames.contains(obj)).count();
         if(count<=0){
             return false;
@@ -3092,14 +3091,14 @@ public class ConsoleFacade {
         if(StringUtils.isEmpty(str)){
             return null;
         }
-        str = str.trim().replace("，", ";").replace(",", ";")
-                 .replace("、", ";").replace("；", ";")
-                 .replace("|", ";").replace(" ", ";")
-                 .replace(":", ";") .replace("：", ";");
-        if(str.startsWith(";")){
+        str = str.trim().replace("；", ",").replace(";", ",")
+                        .replace("、", ",").replace("，", ",")
+                        .replace("|", ",").replace(" ", ",")
+                        .replace(":", ",") .replace("：", ",");
+        if(str.startsWith(",")){
             str = str.substring(1);
         }
-        if(str.endsWith(";")){
+        if(str.endsWith(",")){
             str = str.substring(0,str.length()-1);
         }
 
@@ -3108,8 +3107,8 @@ public class ConsoleFacade {
     static Set strTranListMethod(String str){
         Set<String> names = new HashSet<>();
         if(StringUtils.isNotEmpty(str)){
-        if(str.contains(";") && str.length()>1){
-            for (String diagnoseName : str.split(";")) {
+        if(str.contains(",") && str.length()>1){
+            for (String diagnoseName : str.split(",")) {
                 names.add(diagnoseName);
             }
         }else{