瀏覽代碼

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

jinhu 2 周之前
父節點
當前提交
e5e85cfe6a
共有 1 個文件被更改,包括 8 次插入2 次删除
  1. 8 2
      src/main/java/com/kcim/dao/repository/QualificationApplyRepository.java

+ 8 - 2
src/main/java/com/kcim/dao/repository/QualificationApplyRepository.java

@@ -10,6 +10,7 @@ import com.kcim.dao.model.*;
 import com.kcim.util.BaseUtil;
 import com.kcim.util.PageUtils;
 import lombok.val;
+import net.sf.jsqlparser.statement.select.GroupByElement;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;
@@ -187,6 +188,7 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
 
         //调整记录
         List<QualificationApplyAdjust> listApplyAdjust = applyAdjustRepository.list();
+        Map<Integer, List<QualificationApplyAdjust>> qualificationApplyAdjustMap = listApplyAdjust.stream().collect(Collectors.groupingBy(QualificationApplyAdjust::getQualificationApplyId));
 
         List<QualificationApply> list = this.list(queryWrapper);
         for(QualificationApply apply: list){
@@ -211,12 +213,16 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
 //                        .filter(d -> d.getCode().equals(qualification.getOperationLevelCode()))
 //                        .findFirst();
 //                dic.ifPresent(sysDictionary -> qualification.setOperationLevelName(sysDictionary.getName()));
-                qualification.setOperationLevelName(operationLevelMap.get(qualification.getOperationLevelCode()).getName());
+                SysDictionary operationLevel = operationLevelMap.get(qualification.getOperationLevelCode());
+                if(operationLevel != null){
+                    qualification.setOperationLevelName(operationLevel.getName());
+                }
             }
             apply.setQualificationInfo(qualification);
 
             //调整历史
-            List<QualificationApplyAdjust> applyAdjustList = listApplyAdjust.stream().filter(a -> a.getQualificationApplyId().equals(apply.getId())).collect(Collectors.toList());
+            //List<QualificationApplyAdjust> applyAdjustList = listApplyAdjust.stream().filter(a -> a.getQualificationApplyId().equals(apply.getId())).collect(Collectors.toList());
+            List<QualificationApplyAdjust> applyAdjustList = qualificationApplyAdjustMap.get(apply.getId());
 
             //调整历史-调整人姓名
             for(QualificationApplyAdjust adjust : applyAdjustList){