充装后复查么有则不合格

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/TzCylinderServiceImpl.java

@@ -179,13 +179,16 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 		}
 
 		for (TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList) {
-			List<TzCylinderCheckDto> collect = tzCylinderFillingDto.getTzCylinderAfterCheckDtoList().stream().filter(dto -> dto.getResult().equals("0")).collect(Collectors.toList());
-		   if (collect.size() != 0) {
-			   tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.NOHEGE.getName());
-		   }else {
-			   tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.HEGE.getName());
-		   }
-
+			if (ValidationUtil.isEmpty(tzCylinderFillingDto.getTzCylinderAfterCheckDtoList())) { // 充装后复查记录没有默认不合格
+				tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.NOHEGE.getName());
+			} else {
+				List<TzCylinderCheckDto> collect = tzCylinderFillingDto.getTzCylinderAfterCheckDtoList().stream().filter(dto -> dto.getResult().equals("0")).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.NOHEGE.getName());
+				} else {
+					tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.HEGE.getName());
+				}
+			}
 		}
 		return new TzCylinderTraceDto(tzCylinderProduceDto, tzCylinderInfoDto, tzCylinderTagsDto,
 				tzCylinderInspectionDtoList, tzCylinderFillingDtoList);