修改数据比对空异常

daqe-center/src/main/java/com/lantone/daqe/facade/BlockLossManagementFacade.java

@@ -130,17 +130,23 @@ public class BlockLossManagementFacade {
         //病历数据
         dataCompareVO.setOperationUrl("save/saveBehospitalCode");
         List<GetOperationLogDTO> behospitalCodeLogs = getOperationLogs(dataCompareVO);
+        //病案首页数据
+        List<GetOperationLogDTO> homePageLogs = new ArrayList<>();
+        //文书数据
+        List<GetOperationLogDTO> recLogs = new ArrayList<>();
+
         List<String> logCodes = null;
+        //没有病历数据就不用去查病案首页和文书
         if (ListUtil.isNotEmpty(behospitalCodeLogs)) {
             logCodes = behospitalCodeLogs.stream().map(GetOperationLogDTO::getBehospitalCode).collect(Collectors.toList());
+            dataCompareVO.setBehospitalCodes(logCodes);
+            //病案首页数据
+            dataCompareVO.setOperationUrl("save/saveHomePages");
+            homePageLogs = getOperationLogs(dataCompareVO);
+            //文书数据
+            dataCompareVO.setOperationUrl("save/saveRecs");
+            recLogs = getOperationLogs(dataCompareVO);
         }
-        dataCompareVO.setBehospitalCodes(logCodes);
-        //病案首页数据
-        dataCompareVO.setOperationUrl("save/saveHomePages");
-        List<GetOperationLogDTO> homePageLogs = getOperationLogs(dataCompareVO);
-        //文书数据
-        dataCompareVO.setOperationUrl("save/saveRecs");
-        List<GetOperationLogDTO> recLogs = getOperationLogs(dataCompareVO);
 
         //获取库中数据
         //病历数据
@@ -596,21 +602,24 @@ public class BlockLossManagementFacade {
         //病历数据
         dataCompareVO.setOperationUrl("save/saveBehospitalCode");
         List<GetOperationLogDTO> behospitalCodeLogs = getOperationLogs(dataCompareVO);
-        List<String> logCodes = null;
-        if (ListUtil.isNotEmpty(behospitalCodeLogs)) {
-            logCodes = behospitalCodeLogs.stream().map(GetOperationLogDTO::getBehospitalCode).collect(Collectors.toList());
-        }
-        dataCompareVO.setBehospitalCodes(logCodes);
         //病案首页数据
-        dataCompareVO.setOperationUrl("save/saveHomePages");
-        List<GetOperationLogDTO> homePageLogs = getOperationLogs(dataCompareVO);
+        List<GetOperationLogDTO> homePageLogs = new ArrayList<>();
         //文书数据
-        dataCompareVO.setOperationUrl("save/saveRecs");
-        List<GetOperationLogDTO> recLogs = getOperationLogs(dataCompareVO);
-        Integer logNum = logCodes.size() + homePageLogs.size() + recLogs.size();
+        List<GetOperationLogDTO> recLogs = new ArrayList<>();
 
+        if (ListUtil.isNotEmpty(behospitalCodeLogs)) {
+            List<String> logCodes = behospitalCodeLogs.stream().map(GetOperationLogDTO::getBehospitalCode).collect(Collectors.toList());
+            dataCompareVO.setBehospitalCodes(logCodes);
+            //病案首页数据
+            dataCompareVO.setOperationUrl("save/saveHomePages");
+            homePageLogs = getOperationLogs(dataCompareVO);
+            //文书数据
+            dataCompareVO.setOperationUrl("save/saveRecs");
+            recLogs = getOperationLogs(dataCompareVO);
+            Integer logNum = logCodes.size() + homePageLogs.size() + recLogs.size();
+            blockLossTypeGatherDTO.setLogNum(logNum);
+        }
 
-        blockLossTypeGatherDTO.setLogNum(logNum);
         //获取该时间段的实际数量
         List<String> codes = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)