义乌核查代码调整

src/main/java/com/diagbot/facade/MedCheckInfoFacade.java

@@ -143,7 +143,30 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
      */
     public List<CheckJobDTO> getUserCheckList(CheckJobVO checkJobVO) {
         //质控管理员要判断该角色是否是质控科
-        return this.getCheckList(checkJobVO);
+        //1.获取质控科id
+        //获取人员id 和 该人员的医院id
+        Long hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
+        Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
+        String zkkDeptId = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id",hospitalId)
+                .like("dept_name","质管科")).getDeptId();
+        if(StringUtil.isBlank(zkkDeptId))
+        {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "科室质管科不存在!");
+        }
+        //2.获取监管人员所在科室集合
+        List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id",hospitalId)
+                .eq("user_id",principleId)
+        ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
+        //3.判断这个人是否在质控科
+        if(deptIds.contains(zkkDeptId))
+        {
+            return baseMapper.getCheckList(checkJobVO);
+        }
+       return null;
     }
     /**
      * @Author songxl
@@ -168,7 +191,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         List<Long> roleIds = sysUserRoleFacade.list(new QueryWrapper<SysUserRole>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("user_id", principleId)
-//                .in("role_id",checkRoleIds)
+                .in("role_id",checkRoleIds)
         ).stream().distinct().map(SysUserRole::getRoleId).collect(Collectors.toList());
         List<Long> searchRoleIds = new ArrayList<>();
         //当前用户是监管人员或者是超级管理员
@@ -264,7 +287,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         checkUserVO.setJobType(1);
         checkUserVO.setUserList(doctorIds);
         //通过核查人员id获取核查人员的核查任务数
-        List<DeptCheckUserDTO> userJobs = this.getJobNumByUserId(checkUserVO);
+        List<DeptCheckUserDTO> userJobs = baseMapper.getJobNumByUserId(checkUserVO);
         addCheckInfoMap(checkRoleMap,doctorInfos,userJobs,deptInfos,6);
     }
 
@@ -301,7 +324,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
             checkUserVO.setJobType(2);
             checkUserVO.setUserList(doctorIds);
             //通过核查人员id获取核查人员的核查任务数
-            List<DeptCheckUserDTO> userJobs = this.getJobNumByUserId(checkUserVO);
+            List<DeptCheckUserDTO> userJobs = baseMapper.getJobNumByUserId(checkUserVO);
             addCheckInfoMap(checkRoleMap,doctorInfos,userJobs,deptInfos,5);
         }
 
@@ -331,7 +354,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         checkUserVO.setJobType(0);
         checkUserVO.setUserList(doctorIds);
         //通过核查人员id获取核查人员的核查任务数
-        List<DeptCheckUserDTO> userJobs = this.getJobNumByUserId(checkUserVO);
+        List<DeptCheckUserDTO> userJobs = baseMapper.getJobNumByUserId(checkUserVO);
         addCheckInfoMap(checkRoleMap,doctorInfos,userJobs,deptInfos,4);
     }
 

src/main/java/com/diagbot/service/MedCheckInfoService.java

@@ -18,8 +18,4 @@ import java.util.List;
  * @since 2020-07-06
  */
 public interface MedCheckInfoService extends IService<MedCheckInfo> {
-    //通过核查人员id获取核查人员的核查任务数
-    List<DeptCheckUserDTO> getJobNumByUserId(CheckUserVO checkUserVO);
-
-    List<CheckJobDTO> getCheckList(CheckJobVO checkJobVO);
 }

src/main/java/com/diagbot/service/impl/MedCheckInfoServiceImpl.java

@@ -23,14 +23,6 @@ import java.util.List;
 @Service
 public class MedCheckInfoServiceImpl extends ServiceImpl<MedCheckInfoMapper, MedCheckInfo> implements MedCheckInfoService {
 
-    @Override
-    public List<DeptCheckUserDTO> getJobNumByUserId(CheckUserVO checkUserVO) {
-        return baseMapper.getJobNumByUserId(checkUserVO);
-    }
 
-    @Override
-    public List<CheckJobDTO> getCheckList(CheckJobVO checkJobVO) {
-        //
-        return baseMapper.getCheckList(checkJobVO);
-    }
+
 }

src/main/java/com/diagbot/web/MedCheckInfoController.java

@@ -47,7 +47,7 @@ public class MedCheckInfoController {
 
 
 
-    @ApiOperation(value = "获取核查人员列表[by:songxl]",
+    @ApiOperation(value = "分配核查任务--获取核查人员列表[by:songxl]",
             notes = "获取核查人员列表")
     @PostMapping("/getCheckUserMap")
     @SysLogger("getCheckUserMap")
@@ -57,7 +57,7 @@ public class MedCheckInfoController {
     }
 
 
-    @ApiOperation(value = "获取待分配核查任务列表[by:songxl]",
+    @ApiOperation(value = "分配核查任务--获取待分配核查任务列表[by:songxl]",
             notes = "startTime：任务生成开始时间 必填<br>" +
                     "endTime：  任务生成结束时间 必填<br>" +
                     "checkType：核查类型 必填 0-科室任务 1-院级 2-质控科<br>" +