|
@@ -155,7 +155,8 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
|
|
public List<QualificationApply> listByQualification(String qualificationCode,String userId)
|
|
public List<QualificationApply> listByQualification(String qualificationCode,String userId)
|
|
{
|
|
{
|
|
//用户信息
|
|
//用户信息
|
|
- List<UserInfo> userInfos = userInfoRepository.list();
|
|
|
|
|
|
+ List<UserInfo> empList = userInfoRepository.list();
|
|
|
|
+ Map<Long,UserInfo> empMap = empList.stream().collect(Collectors.toMap(UserInfo::getId, vo -> vo, (a, b) -> b));
|
|
|
|
|
|
//ApplyStatus 当前状态 1草稿 2待科主任审核 3待医务部审核 4待院长审核 5审核通过 6驳回
|
|
//ApplyStatus 当前状态 1草稿 2待科主任审核 3待医务部审核 4待院长审核 5审核通过 6驳回
|
|
LambdaQueryWrapper<QualificationApply> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<QualificationApply> queryWrapper = new LambdaQueryWrapper<>();
|
|
@@ -181,11 +182,14 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
|
|
//资质分类
|
|
//资质分类
|
|
List<QualificationType> listQualificationType = qualificationTypeRepository.list();
|
|
List<QualificationType> listQualificationType = qualificationTypeRepository.list();
|
|
|
|
|
|
|
|
+ //调整记录
|
|
|
|
+ List<QualificationApplyAdjust> listApplyAdjust = applyAdjustRepository.list();
|
|
|
|
+
|
|
List<QualificationApply> list = this.list(queryWrapper);
|
|
List<QualificationApply> list = this.list(queryWrapper);
|
|
for(QualificationApply apply: list){
|
|
for(QualificationApply apply: list){
|
|
|
|
|
|
//医生信息
|
|
//医生信息
|
|
- apply.setUserInfo(userInfos.stream().filter(u -> u.getId().equals(apply.getUserId())).findFirst().orElse(null));
|
|
|
|
|
|
+ apply.setUserInfo(empMap.get(apply.getUserId()));
|
|
|
|
|
|
//资质信息
|
|
//资质信息
|
|
//Qualification qualification = qualificationRepository.getByCode(apply.getQualificationCode());
|
|
//Qualification qualification = qualificationRepository.getByCode(apply.getQualificationCode());
|
|
@@ -206,7 +210,14 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
|
|
apply.setQualificationInfo(qualification);
|
|
apply.setQualificationInfo(qualification);
|
|
|
|
|
|
//调整历史
|
|
//调整历史
|
|
- apply.setApplyAdjust(applyAdjustRepository.listByApplyId(apply.getId()));
|
|
|
|
|
|
+ List<QualificationApplyAdjust> applyAdjustList = listApplyAdjust.stream().filter(a -> a.getQualificationApplyId().equals(apply.getId())).collect(Collectors.toList());
|
|
|
|
+
|
|
|
|
+ //调整历史-调整人姓名
|
|
|
|
+ for(QualificationApplyAdjust adjust : applyAdjustList){
|
|
|
|
+ adjust.setAdjustUserName(empMap.get(adjust.getUserId()).getName());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ apply.setApplyAdjust(applyAdjustList);
|
|
}
|
|
}
|
|
|
|
|
|
list.sort((Comparator.comparing(QualificationApply::getCurrentStatus, Comparator.reverseOrder()).thenComparing(QualificationApply::getApplyDate, Comparator.reverseOrder())));
|
|
list.sort((Comparator.comparing(QualificationApply::getCurrentStatus, Comparator.reverseOrder()).thenComparing(QualificationApply::getApplyDate, Comparator.reverseOrder())));
|