Merge remote-tracking branch 'origin/dev/20200826_1.4.4' into test

src/main/java/com/diagbot/service/impl/QcresultInfoServiceImpl.java

@@ -211,13 +211,16 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
     public IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO) {
        //基础数据
         IPage<EntryNumDTO> entryNumDTOIPage  = baseMapper.entryGroupByEntryInnerPage(filterPageVO);
+        List<EntryNumDTO> records = entryNumDTOIPage.getRecords();
+        if(CollectionUtils.isEmpty(records)){
+            return entryNumDTOIPage;
+        }
         String hospitalId = filterPageVO.getHospitalId();
         //缺陷总数
           Integer sumInteget = baseMapper.entryGroupByEntrySum(filterPageVO.getHospitalId(),filterPageVO.getIsPlacefile(),
                                                                 filterPageVO.getStartDate(),filterPageVO.getEndDate());
         float nsum = 0;
           Set<Long> ids = new HashSet<Long>();
-        List<EntryNumDTO> records = entryNumDTOIPage.getRecords();
         for (EntryNumDTO record : records) {
             ids.add(record.getId());
             int num = record.getNum().intValue();