Quellcode durchsuchen

v2025.8.4
1、我的资质和医生授权管理,详情优化:授权记录改从单独接口查询,不再放在列表信息中。减少调整历史和人员信息的调用次数

jinhu vor 2 Wochen
Ursprung
Commit
b8395efbcf

+ 9 - 1
src/main/java/com/kcim/dao/repository/QualificationApplyAdjustRepository.java

@@ -22,4 +22,12 @@ public class QualificationApplyAdjustRepository extends ServiceImpl<Qualificatio
         queryWrapper.orderByDesc(QualificationApplyAdjust::getCreateTime);
         return this.list(queryWrapper);
     }
-}
+
+    public List<QualificationApplyAdjust> list() {
+        LambdaQueryWrapper<QualificationApplyAdjust> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(QualificationApplyAdjust::getHospId, BaseUtil.getCurrentLoginHospId());
+        queryWrapper.eq(QualificationApplyAdjust::getDelFlag, NumberConstant.ZERO);
+        queryWrapper.orderByDesc(QualificationApplyAdjust::getCreateTime);
+        return this.list(queryWrapper);
+    }
+}

+ 14 - 3
src/main/java/com/kcim/dao/repository/QualificationApplyRepository.java

@@ -155,7 +155,8 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
     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驳回
         LambdaQueryWrapper<QualificationApply> queryWrapper = new LambdaQueryWrapper<>();
@@ -181,11 +182,14 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
         //资质分类
         List<QualificationType> listQualificationType = qualificationTypeRepository.list();
 
+        //调整记录
+        List<QualificationApplyAdjust> listApplyAdjust = applyAdjustRepository.list();
+
         List<QualificationApply> list = this.list(queryWrapper);
         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());
@@ -206,7 +210,14 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
             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())));

+ 1 - 6
src/main/java/com/kcim/service/impl/QualificationManageServiceImpl.java

@@ -180,12 +180,7 @@ public class QualificationManageServiceImpl extends ServiceImpl<QualificationApp
             qualificationApply.setUserInfo(empMap.get(qualificationApply.getUserId()));
 
             //调整历史
-            qualificationApply.setApplyAdjust(applyAdjustRepository.listByApplyId(qualificationApply.getId()));
-
-            //调整历史-调整人姓名
-            for(QualificationApplyAdjust adjust : qualificationApply.getApplyAdjust()){
-                adjust.setAdjustUserName(empMap.get(adjust.getUserId()).getName());
-            }
+            //qualificationApply.setApplyAdjust(applyAdjustRepository.listByApplyId(qualificationApply.getId()));
 
             //设置「允许重新授权状态」,已过期的授权,如果没有对应的授权中的人时,才可以重新授权
             for(QualificationApply apply : list){