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

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

@@ -191,24 +191,32 @@ public class RecordCheckFacade {
 //        medCheckInfoQueryWrapper.eq("check_id", userId);
 //        medCheckInfoQueryWrapper.eq("check_type", CheckTypeEnum.ALL.getKey());
         MedCheckInfo medCheckInfo = medCheckInfoFacade.getOne(medCheckInfoQueryWrapper);
+        SysUser user = sysUserFacade.getOne(new QueryWrapper<SysUser>()
+                .eq("id", userId)
+                .eq("is_deleted", IsDeleteEnum.N.getKey()));
         if (medCheckInfo == null) {
             MedCheckInfo insertCheckInfo = new MedCheckInfo();
             insertCheckInfo.setBehospitalCode(recordCheckVO.getBehospitalCode());
             insertCheckInfo.setCheckId(userId);
-            SysUser user = sysUserFacade.getOne(new QueryWrapper<SysUser>()
-                    .eq("id", userId)
-                    .eq("is_deleted", IsDeleteEnum.N.getKey()));
             if (user != null) {
                 insertCheckInfo.setCheckName(user.getLinkman());
             }
             insertCheckInfo.setCheckType(CheckTypeEnum.ALL.getKey());
             insertCheckInfo.setHospitalId(hospitalId);
             insertCheckInfo.setStatus(1);
+            //有科室核查人员角色就讲任务定义为科室核查任务（只针对七院科室核查）
+            if(checkRoleIds.contains(CheckerRoleEnum.DEPT_GENERAL.getKey()*1l)){
+                insertCheckInfo.setCheckType(0);
+            }
             insertCheckInfo.setCheckTime(DateUtil.now());
             return medCheckInfoFacade.save(insertCheckInfo);
 
         }
 
+        medCheckInfo.setCheckId(userId);
+        if (user != null) {
+            medCheckInfo.setCheckName(user.getLinkman());
+        }
         medCheckInfo.setStatus(1);
         medCheckInfo.setCheckTime(DateUtil.now());
         medCheckInfoFacade.updateById(medCheckInfo);

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -110,7 +110,7 @@
         AND u.is_deleted = 'N'
         LEFT JOIN bas_doctor_info doctor ON u.username = doctor.doctor_id
         AND doctor.is_deleted = 'N'
-        where b.is_deleted = 'N' and a.is_deleted = 'N' and b.job_distribution_name is not null  and b.`status` is not null
+        where b.is_deleted = 'N' and a.is_deleted = 'N'   and b.`status` is not null
         <if test="jobType != null ">
             and b.job_type = #{jobType}
         </if>