|
@@ -162,7 +162,10 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
|
|
|
.map(deptVitals -> deptVitals.getVitalId())
|
|
|
.collect(Collectors.toList());
|
|
|
if (vitalIds.size() > 0) {
|
|
|
- List<QuestionInfo> vitalList = Lists.newArrayList(questionFacade.listByIds(vitalIds));
|
|
|
+ QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
|
+ questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .in("id", vitalIds);
|
|
|
+ List<QuestionInfo> vitalList = questionFacade.list(questionInfoQueryWrapper);
|
|
|
Map<Long, QuestionInfo> vitalMap = EntityUtil.makeEntityMap(vitalList, "id");
|
|
|
List<QuestionShortDTO> vitals = Lists.newArrayList();
|
|
|
for (Long vitalId : vitalIds) {
|