excel 编码、关联编码循环嵌套

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/AfterwardsAuditController.java

@@ -160,7 +160,7 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 		if (ObjectUtils.nullSafeEquals(param.getCheckState(), AfterwardsAuditStatusEnum.process.getStatus())) {
 			queryWrapper.eq("review_results", "issue_review");
 		}
-		IPage<AfterwardsAudit> violations = afterwardsAuditService.getDoctorViolations(page, queryWrapper, loginUser);
+		IPage<AfterwardsAudit> violations = afterwardsAuditService.getDoctorViolations(page, queryWrapper, loginUser,param.getDoctorId());
 		// 返回结果
 		return Result.OK("获取成功", violations);
 	}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IAfterwardsAuditService.java

@@ -89,7 +89,7 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
      * @param queryWrapper
      * @return
      */
-    IPage<AfterwardsAudit> getDoctorViolations(Page<AfterwardsAudit> page, QueryWrapper<AfterwardsAudit> queryWrapper, LoginUser loginUser);
+    IPage<AfterwardsAudit> getDoctorViolations(Page<AfterwardsAudit> page, QueryWrapper<AfterwardsAudit> queryWrapper, LoginUser loginUser,String doctorId);
 
     /**
      * 获取住院结算明细

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditServiceImpl.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.medical.common.bo.*;
 import org.jeecg.modules.medical.common.bo.after.response.AfterDeptDetailRequest;
 import org.jeecg.modules.medical.common.bo.after.response.AfterwardsAuditDetailResponse;
@@ -25,6 +26,8 @@ import org.jeecg.modules.medical.service.IAfterwardsAuditService;
 import org.jeecg.modules.medical.service.IMedicalDoctorAppealRecordService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.model.DepartIdModel;
+import org.jeecg.modules.system.service.ISysUserDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,6 +60,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     private final IMedicalDoctorAppealRecordService appealRecordService;
     private final ISysUserService sysUserService;
     private final HisMedicalProjectCache hisMedicalProjectCache;
+    private final ISysUserDepartService sysUserDepartService;
 
     @Override
     public IPage<ReportAfterQueryResponseBO> departmentStatistics(Page<AfterwardsAudit> page, AfterwardsAudit afterwardsAudit) {
@@ -426,15 +430,15 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
      * @return
      */
     @Override
-    public IPage<AfterwardsAudit> getDoctorViolations(Page<AfterwardsAudit> page, QueryWrapper<AfterwardsAudit> queryWrapper, LoginUser loginUser) {
+    public IPage<AfterwardsAudit> getDoctorViolations(Page<AfterwardsAudit> page, QueryWrapper<AfterwardsAudit> queryWrapper, LoginUser loginUser,String doctorId) {
         // 根据当前登录，先获取到医生面板
-        SysDepart sysDepart = baseMapper.loadUserDept(loginUser.getUsername());
-        if (null == sysDepart) {
+        List<DepartIdModel> departIdModels = sysUserDepartService.queryDepartIdsOfUser(doctorId);
+        if (oConvertUtils.isEmpty(departIdModels)) {
             log.error("找不到当前医生的科室，请检查");
             throw new JeecgBootException("找不到当前医生的科室，请检查！");
         }
         // 当前登录科室/医生端的科室code
-        String medicalDeptCode = sysDepart.getMedicalDeptCode();
+        String medicalDeptCode = departIdModels.get(0).getValue();
         // 获取医生code
         SysUser userByName = sysUserService.getUserByName(loginUser.getUsername());
         if (null == userByName) {