核查、获取患者详情接口修改

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

@@ -302,10 +302,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             }
             //新增如果当前用户不是核查人员返回标志位用户核查按钮、修改、删除、隐藏显示
             //1.获取病历核查人员id，该操作只能是核查员操作
-            List<MedCheckInfo> medCheckInfos = medCheckInfoFacade.list(new QueryWrapper<MedCheckInfo>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", hospitalId)
-                    .eq("behospital_code", getDetailVO.getBehospitalCode()));
+//            List<MedCheckInfo> medCheckInfos = medCheckInfoFacade.list(new QueryWrapper<MedCheckInfo>()
+//                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                    .eq("hospital_id", hospitalId)
+//                    .eq("behospital_code", getDetailVO.getBehospitalCode()));
 //            if (medCheckInfos.size() == 1 && medCheckInfos.get(0).getCheckId() != null
 //                    && medCheckInfos.get(0).getCheckId().equals(Long.parseLong(SysUserUtils.getCurrentPrincipleID()))) {
 //                //2.1获取核查类型，判断当前用户有没有对应核查类型的角色

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

@@ -391,7 +391,7 @@ public class MedCheckWorkFacade {
     private List<MedoupDTO> getLocalMdeoup(List<BasDeptInfoDTO> selDepts) {
         List<MedoupDTO> medoups = new ArrayList<>();
         if (ListUtil.isNotEmpty(selDepts)) {
-            List<String> deptIds = selDepts.stream().map(BasDeptInfoDTO::getDeptId).collect(Collectors.toList());
+//            List<String> deptIds = selDepts.stream().map(BasDeptInfoDTO::getDeptId).collect(Collectors.toList());
             //获取本人科室关联的医疗组code
 //            List<DeptMedoup> deptMedoups = deptMedoupService.list(new QueryWrapper<DeptMedoup>()
 //                    .eq("is_deleted", IsDeleteEnum.N.getKey())

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

@@ -170,7 +170,7 @@ public class RecordCheckFacade {
         //获取核查监管相关角色id
         List<Long> checkRoleIds = sysRoleFacade.list(new QueryWrapper<SysRole>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .like("name", "监管人员")
+                .like("name", "质控人员")
         ).stream().map(SysRole::getId).collect(Collectors.toList());
         //查询该角色的所有角色id
         List<Long> roleIds = sysUserRoleFacade.list(new QueryWrapper<SysUserRole>()

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -175,7 +175,9 @@
             m.`name` medoupName
             from
             med_behospital_info a ,med_check_info b
-            LEFT JOIN bas_doctor_info mu ON mu.doctor_id = b.job_creator
+            LEFT JOIN sys_user u ON u.id = b.job_creator AND
+            u.is_deleted = 'N'
+            LEFT JOIN bas_doctor_info mu ON mu.doctor_id = u.username
             AND mu.is_deleted = 'N'
             LEFT JOIN sys_medoup m ON m.`code` = mu.group_id
             AND m.is_deleted = 'N'
@@ -219,7 +221,7 @@
                     </foreach>
                 </if>
                 <if test="medoupList !=null and medoupList.size()!=0 ">
-                    AND mu.medoup_code in
+                    AND mu.group_id in
                     <foreach collection="medoupList" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>