处理定时修改评分空指针异常问题

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

@@ -333,7 +333,7 @@ public class ColumnResultManagementFacade {
         List<NonnullInfo> nonnullInfoList = new ArrayList<>();
         List<GetRegular> regularList = new ArrayList<>();
         List<GetStandardvalueInfoDTO> standardvalueList = new ArrayList<>();
-        List<String> behospitalCodeList = null;
+        List<String> behospitalCodeList = new ArrayList<>();
         Date startDate = DateUtil.addDate(DateUtil.now(), -1);
         Date endDate = DateUtil.now();
         //先获取非空的所有字段校验规则
@@ -380,25 +380,27 @@ public class ColumnResultManagementFacade {
             }
         }
         //先判断是否存在规则有修改
-        if (ListUtil.isNotEmpty(nonnullInfoList) && ListUtil.isNotEmpty(standardvalueList) && ListUtil.isNotEmpty(regularList)) {
+        if (ListUtil.isNotEmpty(nonnullInfoList) || ListUtil.isNotEmpty(standardvalueList) || ListUtil.isNotEmpty(regularList)) {
             //获取30天内所有病历
             List<BehospitalInfo> behospitalInfos = getBehospitalInfos(DateUtil.addDate(DateUtil.now(), -30), DateUtil.now(), hospitalId);
-            for (BehospitalInfo behospitalInfo : behospitalInfos) {
-                behospitalCodeList.add(behospitalInfo.getBehospitalCode());
+            if(ListUtil.isNotEmpty(behospitalInfos)) {
+                for (BehospitalInfo behospitalInfo : behospitalInfos) {
+                    behospitalCodeList.add(behospitalInfo.getBehospitalCode());
+                }
             }
         }
         //非空校验规则今天有修改
-        if (ListUtil.isNotEmpty(nonnullInfoList)) {
+        if (ListUtil.isNotEmpty(nonnullInfoList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验非空规则方法
             checkNonnull(nonnullInfos, behospitalCodeList, hospitalId,principleId);
         }
         //正则校验规则今天有修改
-        if (ListUtil.isNotEmpty(regularList)) {
+        if (ListUtil.isNotEmpty(regularList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验正则规则
             checkRegular(regularMappings, behospitalCodeList, hospitalId,principleId);
         }
         //标准值校验规则今天有修改
-        if (ListUtil.isNotEmpty(standardvalueList)) {
+        if (ListUtil.isNotEmpty(standardvalueList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验正则规则
             checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId,principleId);
         }