义乌核查待分配核查列表提交

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -235,6 +235,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/medicalCheckTitleKs").permitAll()
                 .antMatchers("/qc/behospitalInfo/logicDelCase").permitAll()
                 .antMatchers("/qc/medCheckInfo/getCheckUserMap").permitAll()
+                .antMatchers("/qc/medCheckInfo/getCheckList").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -279,6 +279,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/consoleByDept/medicalCheckTitleKs", request)
                 || matchers("/qc/behospitalInfo/logicDelCase", request)
                 || matchers("/qc/medCheckInfo/getCheckUserMap", request)
+                || matchers("/qc/medCheckInfo/getCheckList", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -240,7 +240,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         //2.3获取所有医生信息的核查数
         List<String> doctorIds = doctorInfos.stream().map(BasDoctorInfo::getDoctorId).collect(Collectors.toList());
         CheckUserVO checkUserVO = new CheckUserVO();
-        checkUserVO.setJobType(6);
+        checkUserVO.setJobType(1);
         checkUserVO.setUserList(doctorIds);
         //通过核查人员id获取核查人员的核查任务数
         List<DeptCheckUserDTO> userJobs = this.getJobNumByUserId(checkUserVO);
@@ -277,7 +277,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
             //4.3获取所有医生信息的核查数
             List<String> doctorIds = doctorInfos.stream().map(BasDoctorInfo::getDoctorId).collect(Collectors.toList());
             CheckUserVO checkUserVO = new CheckUserVO();
-            checkUserVO.setJobType(5);
+            checkUserVO.setJobType(2);
             checkUserVO.setUserList(doctorIds);
             //通过核查人员id获取核查人员的核查任务数
             List<DeptCheckUserDTO> userJobs = this.getJobNumByUserId(checkUserVO);
@@ -306,7 +306,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         //2.3获取所有医生信息的核查数
         List<String> doctorIds = doctorInfos.stream().map(BasDoctorInfo::getDoctorId).collect(Collectors.toList());
         CheckUserVO checkUserVO = new CheckUserVO();
-        checkUserVO.setJobType(4);
+        checkUserVO.setJobType(0);
         checkUserVO.setUserList(doctorIds);
         //通过核查人员id获取核查人员的核查任务数
         List<DeptCheckUserDTO> userJobs = this.getJobNumByUserId(checkUserVO);
@@ -314,9 +314,9 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
     }
 
     private void addCheckInfoMap(Map<String, List<CheckDeptDTO>> checkRoleMap, List<BasDoctorInfo> doctorInfos,
-                                 List<DeptCheckUserDTO> userJobs, List<BasDeptInfo> deptInfos, int workType) {
+                                 List<DeptCheckUserDTO> userJobs, List<BasDeptInfo> deptInfos, int roleId) {
         if(deptInfos.isEmpty()||doctorInfos.isEmpty()){}
-        checkRoleMap.put(workType+"",new ArrayList<CheckDeptDTO>());
+        checkRoleMap.put(roleId+"",new ArrayList<CheckDeptDTO>());
         //遍历科室
         for(BasDeptInfo deptInfo:deptInfos)
         {
@@ -356,7 +356,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
                     }
                 }
             }
-            checkRoleMap.get(workType+"").add(checkDeptDTO);
+            checkRoleMap.get(roleId+"").add(checkDeptDTO);
         }
         System.out.println(checkRoleMap.size());
     }

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

@@ -250,6 +250,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                         .set("opt_type", 3)
                         .set("modifier", useId)
                         .set("gmt_modified", now)
+                        .set("explain_info",algorithmVO.getOptResultAlgVO().getExplainInfo())
                 );
                 break;
             case 4:

src/main/java/com/diagbot/mapper/MedCheckInfoMapper.java

@@ -3,6 +3,7 @@ package com.diagbot.mapper;
 import com.diagbot.dto.DeptCheckUserDTO;
 import com.diagbot.entity.MedCheckInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.CheckJobVO;
 import com.diagbot.vo.CheckUserVO;
 
 import java.util.List;
@@ -18,4 +19,6 @@ import java.util.List;
 public interface MedCheckInfoMapper extends BaseMapper<MedCheckInfo> {
     //通过核查人员id获取核查人员的核查任务数
     List<DeptCheckUserDTO> getJobNumByUserId(CheckUserVO checkUserVO);
+    //获取未分配的核查任务
+    List<Object> getCheckList(CheckJobVO checkJobVO);
 }

src/main/java/com/diagbot/service/MedCheckInfoService.java

@@ -3,6 +3,7 @@ package com.diagbot.service;
 import com.diagbot.dto.DeptCheckUserDTO;
 import com.diagbot.entity.MedCheckInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.CheckJobVO;
 import com.diagbot.vo.CheckUserVO;
 
 import java.util.List;
@@ -18,4 +19,6 @@ import java.util.List;
 public interface MedCheckInfoService extends IService<MedCheckInfo> {
     //通过核查人员id获取核查人员的核查任务数
     List<DeptCheckUserDTO> getJobNumByUserId(CheckUserVO checkUserVO);
+
+    List<Object> getCheckList(CheckJobVO checkJobVO);
 }

src/main/java/com/diagbot/service/impl/MedCheckInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.diagbot.entity.MedCheckInfo;
 import com.diagbot.mapper.MedCheckInfoMapper;
 import com.diagbot.service.MedCheckInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.CheckJobVO;
 import com.diagbot.vo.CheckUserVO;
 import org.springframework.stereotype.Service;
 
@@ -25,4 +26,9 @@ public class MedCheckInfoServiceImpl extends ServiceImpl<MedCheckInfoMapper, Med
     public List<DeptCheckUserDTO> getJobNumByUserId(CheckUserVO checkUserVO) {
         return baseMapper.getJobNumByUserId(checkUserVO);
     }
+
+    @Override
+    public List<Object> getCheckList(CheckJobVO checkJobVO) {
+        return baseMapper.getCheckList(checkJobVO);
+    }
 }

src/main/java/com/diagbot/web/MedCheckInfoController.java

@@ -5,6 +5,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.CheckDeptDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.MedCheckInfoFacade;
+import com.diagbot.vo.CheckJobVO;
 import com.diagbot.vo.MedCheckInfoAddVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -53,4 +54,17 @@ public class MedCheckInfoController {
         Map<String, List<CheckDeptDTO>> userInfoMap = medCheckInfoFacade.getCheckUserMap();
         return RespDTO.onSuc(userInfoMap);
     }
+
+
+    @ApiOperation(value = "获取待分配核查任务列表[by:songxl]",
+            notes = "startTime：任务生成开始时间 必填<br>" +
+                    "endTime：  任务生成结束时间 必填<br>" +
+                    "checkType：核查类型 必填 0-科室任务 1-院级 2-质控科<br>" +
+                    "deptList：明细id，必填<br>")
+    @PostMapping("/getCheckList")
+    @SysLogger("getCheckList")
+    public RespDTO<List<Object>> getCheckList(@RequestBody CheckJobVO checkJobVO) {
+        List<Object> userInfos = medCheckInfoFacade.getCheckList(checkJobVO);
+        return RespDTO.onSuc(userInfos);
+    }
 }

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -41,4 +41,21 @@
         </if>
         GROUP BY job_distributor
     </select>
+
+    <!--获取待分配核查任务列表-->
+    <select id="getCheckList" resultType="com.diagbot.dto.CheckJobDTO">
+        SELECT job_distributor doctorId, count(*) as jobNum
+        from med_check_info
+        where is_deleted = 'N'
+        <if test="jobType != null">
+            and job_type = #{jobType}
+        </if>
+        <if test="userList !=null">
+            and job_distributor in
+            <foreach collection="userList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY job_distributor
+    </select>
 </mapper>

src/test/java/com/diagbot/CodeGeneration.java

@@ -27,7 +27,7 @@ public class CodeGeneration {
 
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("E://code//mrqcsys");
+        gc.setOutputDir("D://code");
         gc.setFileOverride(true);
         gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
         gc.setEnableCache(false);// XML 二级缓存
@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "str_consultation_record"}); // 需要生成的表
+        strategy.setInclude(new String[] { "med_check_info"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);