Merge branch '20210512_yw_check' into test

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

@@ -751,9 +751,12 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         }
         //全院的话要判断院级核查人员和核查病历不是同一科室
         if(CheckJobTypeEnum.HOSP_SUPERVISOR.getKey()==Integer.parseInt(distributionJobVO.getJobType())){
-            if(distributionJobVO.getBehospitalDepts().contains(distributionJobVO.getCheckDept())){
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"院级核查人员和核查病历是同一科室");
+            for(String deptId:distributionJobVO.getCheckDept().split(",")){
+                if(distributionJobVO.getBehospitalDepts().contains(deptId)){
+                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"院级核查人员和核查病历是同一科室");
+                }
             }
+
         }
         //获取人员id 和 该人员的医院id
         Long hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());