缺陷条目无法显示、核查列表页bug修改

src/main/java/com/diagbot/enums/CheckJobTypeEnum.java

@@ -10,8 +10,8 @@ import lombok.Setter;
  */
 public enum CheckJobTypeEnum implements KeyedNamed {
     DEPT_SUPERVISOR(0, "科室任务"),
-    QUAT_SUPERVISOR(1, "质控科"),
-    HOSP_SUPERVISOR(2, "院级");
+    QUAT_SUPERVISOR(1, "质控科任务"),
+    HOSP_SUPERVISOR(2, "院级任务");
 
     @Setter
     private int key;

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

@@ -1034,7 +1034,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", analyzeVO.getHospitalId())
                 .eq("behospital_code", analyzeVO.getBehospitalCode()));
-        if (medCheckInfos.size() == 1 && medCheckInfos.get(0).getStatus().equals((CheckStatusEnum.Enable.getKey() + "")) && analyzeVO.getCheckFlag()) {
+        if (medCheckInfos.size() == 1 && medCheckInfos.get(0).getStatus()==CheckStatusEnum.Enable.getKey() && analyzeVO.getCheckFlag()) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该病例已经核查无需评分！");
         }
         //  调用质控接口

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

@@ -86,6 +86,8 @@ public class RecordCheckFacade {
                 JobTypes.add(CheckJobTypeEnum.HOSP_SUPERVISOR.getKey() + "");
             } else if (roleId.intValue() == CheckerRoleEnum.QUAT_SUPERVISOR.getKey()
                     && (ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes()) || checkedRecordListVO.getCheckJobTypes().contains(CheckJobTypeEnum.QUAT_SUPERVISOR.getKey() + ""))) {
+                //添加质管科人员
+                deptIds.add(zkkDeptId);
                 userIds.addAll(getUserIdsOfRoleId(hospitalId, deptIds, CheckerRoleEnum.QUAT_GENERAL.getKey()));
                 JobTypes.add(CheckJobTypeEnum.QUAT_SUPERVISOR.getKey() + "");
             } else if (roleId.intValue() == CheckerRoleEnum.DEPT_SUPERVISOR.getKey() && ListUtil.isNotEmpty(deptIds)
@@ -100,6 +102,10 @@ public class RecordCheckFacade {
             }
         });
 
+        //如果用户是质控科核查人员，在不传入任务类型的时候要添加质控科任务类型进行筛选
+        if(roleIds.contains(CheckerRoleEnum.QUAT_GENERAL.getKey()*1l)){
+            JobTypes.add(CheckJobTypeEnum.QUAT_SUPERVISOR.getKey() + "");
+        }
         if(ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes())){
             checkedRecordListVO.setCheckJobTypes(JobTypes);
         }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -680,21 +680,22 @@
     </select>-->
 
     <select id="getMsg" resultType="com.diagbot.dto.MsgDTO">
-        SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,c.info,
-        a.cases_id cases_id, d.score cases_score,b.id model_id, a.name standard_msg,
-        c.opt_type, c.grade_type, c.gmt_create, c.gmt_modified,
-        c.modifier,u.linkman,c.is_deleted,c.explain_info as explainInfo,
+        SELECT a.*, u.linkman
+        FROM
+        (
+        SELECT DISTINCT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,c.info, a.cases_id cases_id, d.score cases_score,
+        b.id model_id, a.name standard_msg, c.opt_type, c.grade_type,
+         c.gmt_create, c.gmt_modified, c.modifier,c.is_deleted,c.explain_info as explainInfo,
         a.type, a.drgs
-        FROM `qc_cases_entry` a, qc_mode b, med_qcresult_detail c, qc_cases_hospital d ,sys_user u
-        where a.is_deleted = 'N' and b.is_deleted = 'N' and  d.is_deleted = 'N'
-        and u.is_deleted = 'N' and u.id = c.modifier
-        and a.id = c.cases_entry_id
-        and a.mode_id = b.id
-        AND c.cases_id = d.cases_id
-        and c.hospital_id = d.hospital_id
+        FROM
+        `qc_cases_entry` a, qc_mode b, med_qcresult_detail c, qc_cases_hospital d
+        where a.is_deleted = 'N' and b.is_deleted = 'N' and d.is_deleted = 'N'
+        and a.id = c.cases_entry_id and a.mode_id = b.id
+        AND c.cases_id = d.cases_id and c.hospital_id = d.hospital_id
         and c.hospital_id = #{hospitalId}
         and c.behospital_code = #{behospitalCode}
-        order by b.order_no, c.grade_type desc, a.order_no
+        order by b.order_no, c.grade_type desc, a.order_no) a
+        LEFT JOIN sys_user u  on u.id = a.modifier  and u.is_deleted = 'N'
     </select>
 
 

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -353,8 +353,8 @@
         c.`level` as level,
         c.score_res as scoreRes,
         CASE WHEN a.job_type='0' THEN '科室任务'
-        WHEN a.job_type='1' THEN '质控科'
-        WHEN a.job_type='2' THEN '院级' END AS jobTypeName,
+        WHEN a.job_type='1' THEN '质控科任务'
+        WHEN a.job_type='2' THEN '院级任务' END AS jobTypeName,
         <!-- 张三是A科室的监管员，李四是A科室和B科室的普通质控员，那么张三在核查任务列表中不能看到李四B科室的数据  -->
         case when a.job_type='0' and FIND_IN_SET(b.beh_dept_id,#{currentDeptIds})=0 then 0 else 1 end as isDel
         from med_check_info a join med_behospital_info b on a.hospital_id=b.hospital_id and