|
|
|
@ -532,7 +532,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl |
|
|
|
if (StringUtils.isNotEmpty(studyFormFill.getResource()) && !StringUtils.equals(empty, studyFormFill.getResource())) { |
|
|
|
List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(studyFormFill.getResource(), StudyFormFillResource.class); |
|
|
|
result = studyFormFillResourceList.stream().filter( |
|
|
|
p -> (p.getType() != null)).collect(Collectors.toList()); |
|
|
|
p -> (p.getType()!=null&&!p.getType().equals(StudyFormFillResourceTypeEnum.sj.getValue()))).collect(Collectors.toList()); |
|
|
|
List<StudyFormFillResource> tmp = studyFormFillResourceList.stream().filter( |
|
|
|
p -> (p.getType() == null)).collect(Collectors.toList()); |
|
|
|
if (tmp.size() > 0) { |
|
|
|
|