diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index 4a395f7..1aac80e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -532,7 +532,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl 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 tmp = studyFormFillResourceList.stream().filter( p -> (p.getType() == null)).collect(Collectors.toList()); if (tmp.size() > 0) {