Merge remote-tracking branch 'origin/dev/20200727_2.0.0' into debug

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

@@ -1141,7 +1141,9 @@ public class ConsoleFacade {
             }
         });
         //增加全院数据
-        if (StringUtil.isBlank(filterUnModifyMRVO.getName()) || filterUnModifyMRVO.getName().equals("全院")) {
+        if (ListUtil.isNotEmpty(retList) &&
+                (StringUtil.isBlank(filterUnModifyMRVO.getName())
+                        || filterUnModifyMRVO.getName().equals("全院"))) {
             try {
 
                 Object globleObj = new Object();