diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDataServiceImpl.java index cfc37a5b..d421423e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDataServiceImpl.java @@ -149,8 +149,8 @@ public class BusinessAssayTaskDataServiceImpl implements BusinessAssayTaskDataSe for (BusinessAssayTaskDataExtendRespVO businessAssayTaskData : list) { ConfigSubSampleMethodExtendRespVO configSubSampleMethod = configSubSampleMethodList.stream().filter(f -> f.getConfigSubSampleId().equals(businessAssayTaskData.getConfigSubSampleId()) && f.getConfigAssayMethodId().equals(businessAssayTaskData.getConfigAssayMethodId())).findFirst().orElse(null); - String configInfomation = configSubSampleMethod.getConfigInfomation(); - if (StringUtils.isNotBlank(configInfomation)) { + if (configSubSampleMethod != null && StringUtils.isNotBlank(configSubSampleMethod.getConfigInfomation())) { + String configInfomation = configSubSampleMethod.getConfigInfomation(); ConfigSubSampleMethodConfInfo configSubSampleMethodConfInfo = JSON.parseObject(configInfomation, ConfigSubSampleMethodConfInfo.class); List getParamList = configSubSampleMethodConfInfo.getGetParam(); StringBuilder ingredientInfoBuilder = new StringBuilder(); @@ -217,8 +217,9 @@ public class BusinessAssayTaskDataServiceImpl implements BusinessAssayTaskDataSe for (BusinessAssayTaskDataExtendRespVO businessAssayTaskData : list) { ConfigSubSampleMethodExtendRespVO configSubSampleMethod = configSubSampleMethodList.stream().filter(f -> f.getConfigSubSampleId().equals(businessAssayTaskData.getConfigSubSampleId()) && f.getConfigAssayMethodId().equals(businessAssayTaskData.getConfigAssayMethodId())).findFirst().orElse(null); - String configInfomation = configSubSampleMethod.getConfigInfomation(); - if (StringUtils.isNotBlank(configInfomation)) { + + if (configSubSampleMethod != null && StringUtils.isNotBlank(configSubSampleMethod.getConfigInfomation())) { + String configInfomation = configSubSampleMethod.getConfigInfomation(); ConfigSubSampleMethodConfInfo configSubSampleMethodConfInfo = JSON.parseObject(configInfomation, ConfigSubSampleMethodConfInfo.class); List getParamList = configSubSampleMethodConfInfo.getGetParam(); StringBuilder ingredientInfoBuilder = new StringBuilder();