|
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @Description:
|
|
* @Description:
|
|
@@ -111,8 +112,10 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
|
|
deptVitalQueryWrapper.eq("dept_id", deptId).
|
|
deptVitalQueryWrapper.eq("dept_id", deptId).
|
|
eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
List<DeptVital> deptVitalList = this.list(deptVitalQueryWrapper);
|
|
List<DeptVital> deptVitalList = this.list(deptVitalQueryWrapper);
|
|
- Map<Long, DeptVital> vitalIdsMap = EntityUtil.makeEntityMap(deptVitalList, "vitalId");
|
|
|
|
- List<QuestionInfo> vitalList = Lists.newArrayList(questionInfoFacade.listByIds(vitalIdsMap.keySet()));
|
|
|
|
|
|
+ List<Long> vitalIds = deptVitalList.stream()
|
|
|
|
+ .map(deptVitals -> deptVitals.getVitalId())
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
+ List<QuestionInfo> vitalList = Lists.newArrayList(questionInfoFacade.listByIds(vitalIds));
|
|
return vitalList;
|
|
return vitalList;
|
|
}
|
|
}
|
|
}
|
|
}
|