Merge remote-tracking branch 'origin/20210512_yw_check' into 20210512_yw_check

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

@@ -72,14 +72,18 @@ public class RecordCheckFacade {
             } else if (roleId.intValue() == CheckerRoleEnum.QUAT_SUPERVISOR.getKey()
                     && (ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes()) || checkedRecordListVO.getCheckJobTypes().contains(CheckJobTypeEnum.QUAT_SUPERVISOR.getKey() + ""))) {
                 userIds.addAll(getUserIdsOfRoleId(hospitalId, deptIds, CheckerRoleEnum.QUAT_GENERAL.getKey()));
-            } else if (roleId.intValue() == CheckerRoleEnum.DEPT_SUPERVISOR.getKey()
+            } else if (roleId.intValue() == CheckerRoleEnum.DEPT_SUPERVISOR.getKey() && ListUtil.isNotEmpty(deptIds)
                     && (ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes()) || checkedRecordListVO.getCheckJobTypes().contains(CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + ""))) {
                 userIds.addAll(getUserIdsOfRoleId(hospitalId, deptIds, CheckerRoleEnum.DEPT_GENERAL.getKey()));
-            } else if (roleId.intValue() == CheckerRoleEnum.DEPT_GENERAL.getKey() || roleId.intValue() == CheckerRoleEnum.QUAT_GENERAL.getKey() || roleId.intValue() == CheckerRoleEnum.HOSP_GENERAL.getKey()) {
+            } else if ((roleId.intValue() == CheckerRoleEnum.DEPT_GENERAL.getKey() && ListUtil.isNotEmpty(deptIds))
+                    || roleId.intValue() == CheckerRoleEnum.QUAT_GENERAL.getKey() || roleId.intValue() == CheckerRoleEnum.HOSP_GENERAL.getKey()) {
                 userIds.add(userId);
             }
         });
 
+        if (ListUtil.isEmpty(userIds)) {
+            userIds.add(999999999999999999l);
+        }
         checkedRecordListVO.setCurrentDeptIds(String.join(",", deptIds));
         checkedRecordListVO.setCurrentGeneralUserIds(userIds);
         checkedRecordListVO.setHospitalId(hospitalId);

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -267,7 +267,7 @@
         LEFT JOIN med_qcresult_info mqi
         ON mbi.behospital_code = mqi.behospital_code
         AND mbi.hospital_id = mqi.hospital_id AND mqi.is_deleted = 'N'
-        LEFT JOIN med_behospital_type mbt ON mbi.behospital_code = mbt.behospital_code
+        JOIN med_behospital_type mbt ON mbi.behospital_code = mbt.behospital_code
         AND mbi.hospital_id = mbt.hospital_id AND mbt.is_deleted = 'N'
         WHERE mbi.hospital_id=#{hospitalId} AND mbi.is_deleted = 'N' and mqi.score_res is not null
         AND mci.check_id is null