|
@@ -220,7 +220,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
|
|
|
}
|
|
|
/**
|
|
|
* @Author songxl
|
|
|
- * @Description 获取操作用户的核查科室以及人员
|
|
|
+ * @Description 获取操作用户的核查科室以及科室核查人员
|
|
|
* @Date 2021/5/14
|
|
|
* @Param []
|
|
|
* @Return java.util.Map<java.lang.String,java.util.List<com.diagbot.dto.CheckDeptDTO>>
|
|
@@ -301,7 +301,14 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
|
|
|
}
|
|
|
return checkRoleMap;
|
|
|
}
|
|
|
-
|
|
|
+ /**
|
|
|
+ * @Author songxl
|
|
|
+ * @Description 院区管理员获取管理的科室以及科室包涵质控人员
|
|
|
+ * @Date 2021/5/17
|
|
|
+ * @Param [checkRoleMap, hospitalId, principleId]
|
|
|
+ * @Return void
|
|
|
+ * @MethodName getYQCheckInfo
|
|
|
+ */
|
|
|
private void getYQCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
|
|
|
//1.获取院级质控人员有哪些
|
|
|
//1.1获取院级质控人员角色id
|
|
@@ -340,7 +347,14 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
|
|
|
List<DeptCheckUserDTO> userJobs = baseMapper.getJobNumByUserId(checkUserVO);
|
|
|
addCheckInfoMap(checkRoleMap,doctorInfos,userJobs,deptInfos,6);
|
|
|
}
|
|
|
-
|
|
|
+ /**
|
|
|
+ * @Author songxl
|
|
|
+ * @Description 质控科管理员获取管理的科室以及科室包涵质控人员
|
|
|
+ * @Date 2021/5/17
|
|
|
+ * @Param [checkRoleMap, hospitalId, principleId]
|
|
|
+ * @Return void
|
|
|
+ * @MethodName getZKKCheckInfo
|
|
|
+ */
|
|
|
private void getZKKCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
|
|
|
//1.获取质控科id
|
|
|
String zkkDeptId = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
|
|
@@ -379,8 +393,16 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+ /**
|
|
|
+ * @Author songxl
|
|
|
+ * @Description 临床科室管理员获取管理的科室以及科室包涵质控人员
|
|
|
+ * @Date 2021/5/17
|
|
|
+ * @Param [checkRoleMap, hospitalId, principleId]
|
|
|
+ * @Return void
|
|
|
+ * @MethodName getDeptCheckInfo
|
|
|
+ */
|
|
|
private void getDeptCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
|
|
|
+
|
|
|
//1.获取监管人员所在科室集合
|
|
|
List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
@@ -407,7 +429,14 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
|
|
|
List<DeptCheckUserDTO> userJobs = baseMapper.getJobNumByUserId(checkUserVO);
|
|
|
addCheckInfoMap(checkRoleMap,doctorInfos,userJobs,deptInfos,4);
|
|
|
}
|
|
|
-
|
|
|
+ /**
|
|
|
+ * @Author songxl
|
|
|
+ * @Description 拼装科室、核查人员、任务数对象
|
|
|
+ * @Date 2021/5/17
|
|
|
+ * @Param [checkRoleMap, doctorInfos, userJobs, deptInfos, roleId]
|
|
|
+ * @Return void
|
|
|
+ * @MethodName addCheckInfoMap
|
|
|
+ */
|
|
|
private void addCheckInfoMap(Map<String, List<CheckDeptDTO>> checkRoleMap, List<BasDoctorInfo> doctorInfos,
|
|
|
List<DeptCheckUserDTO> userJobs, List<BasDeptInfo> deptInfos, int roleId) {
|
|
|
if(deptInfos.isEmpty()||doctorInfos.isEmpty()){}
|
|
@@ -453,7 +482,6 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
|
|
|
}
|
|
|
checkRoleMap.get(roleId+"").add(checkDeptDTO);
|
|
|
}
|
|
|
- System.out.println(checkRoleMap.size());
|
|
|
}
|
|
|
|
|
|
/**
|