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

# Conflicts:
#	src/main/java/com/diagbot/service/impl/MedCheckInfoServiceImpl.java

src/main/java/com/diagbot/entity/MedCheckWork.java

@@ -1,108 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author songxl
- * @since 2021-05-11
- */
-@TableName("med_check_work")
-@Data
-public class MedCheckWork implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    private String behospitalCode;
-
-    /**
-     * 创建者
-     */
-    private String creator;
-
-    /**
-     * 修改者
-     */
-    private String modifier;
-
-    /**
-     * 核查用户
-     */
-    private String checkUser;
-
-    /**
-     * 创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 修改时间
-     */
-    private Date gmtModified;
-
-    /**
-     * 核查时间
-     */
-    private Date checkTime;
-
-    /**
-     * 任务类型(0-科室任务 1-院级 2-质控科)
-     */
-    private String workType;
-
-    /**
-     * 分配状态(0-未分配 1-已分配)
-     */
-    private String distribution;
-
-    /**
-     * 核查状态(0-未核查 1-已核查)
-     */
-    private String checkStatus;
-
-    /**
-     * 是否删除
-     */
-    private String isDeleted;
-    @Override
-    public String toString() {
-        return "MedCheckWork{" +
-            "id=" + id +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", checkUser=" + checkUser +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", checkTime=" + checkTime +
-            ", workType=" + workType +
-            ", distribution=" + distribution +
-            ", checkStatus=" + checkStatus +
-            ", isDeleted=" + isDeleted +
-        "}";
-    }
-}

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

@@ -5,14 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.CheckWorkDTO;
 import com.diagbot.dto.MedicalRecordDTO;
 import com.diagbot.entity.MedBehospitalType;
-import com.diagbot.entity.MedCheckWork;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.MedBehospitalTypeServiceImpl;
-import com.diagbot.service.impl.MedCheckWorkServiceImpl;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,9 +25,9 @@ import java.util.List;
  * @since 2021-05-11
  */
 @Component
-public class MedCheckWorkFacade extends MedCheckWorkServiceImpl {
+public class MedCheckWorkFacade {
     @Autowired
-    private MedCheckWorkServiceImpl medCheckWorkServiceImpl;
+    private MedCheckInfoFacade medCheckInfoFacade;
     @Autowired
     private MedBehospitalTypeServiceImpl medBehospitalTypeServiceImpl;
     @Autowired
@@ -59,7 +56,8 @@ public class MedCheckWorkFacade extends MedCheckWorkServiceImpl {
 
         List<MedCheckWork> checkWorkList = new ArrayList<>();
 
-        return medCheckWorkServiceImpl.saveBatch(checkWorkList, 10);
+//        return medCheckWorkServiceImpl.saveBatch(checkWorkList, 10);
+        return null;
     }
 
     /**
@@ -183,7 +181,7 @@ public class MedCheckWorkFacade extends MedCheckWorkServiceImpl {
      */
     public IPage<CheckWorkDTO> pageFac(CheckWorkPageVO checkWorkPageVO) {
         checkWorkPageSet(checkWorkPageVO);
-        IPage<CheckWorkDTO> res = getCheckWorkPage(checkWorkPageVO);
+        IPage<CheckWorkDTO> res = medCheckInfoFacade.getBaseMapper().getCheckWorkPage(checkWorkPageVO);
         return res;
     }
 

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

@@ -1,11 +1,14 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.CheckJobDTO;
+import com.diagbot.dto.CheckWorkDTO;
 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 com.diagbot.vo.CheckWorkPageVO;
 
 import java.util.List;
 
@@ -22,4 +25,11 @@ public interface MedCheckInfoMapper extends BaseMapper<MedCheckInfo> {
     List<DeptCheckUserDTO> getJobNumByUserId(CheckUserVO checkUserVO);
     //获取未分配的核查任务
     List<CheckJobDTO> getCheckList(CheckJobVO checkJobVO);
+    /**
+     * 核查任务列表
+     *
+     * @param checkWorkPageVO
+     * @return
+     */
+    IPage<CheckWorkDTO> getCheckWorkPage(CheckWorkPageVO checkWorkPageVO);
 }

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

@@ -1,27 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.CheckWorkDTO;
-import com.diagbot.entity.MedCheckWork;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.vo.CheckWorkPageVO;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author songxl
- * @since 2021-05-11
- */
-public interface MedCheckWorkMapper extends BaseMapper<MedCheckWork> {
-
-    /**
-     * 核查任务列表
-     *
-     * @param checkWorkPageVO
-     * @return
-     */
-    public IPage<CheckWorkDTO> getCheckWorkPage(CheckWorkPageVO checkWorkPageVO);
-
-}

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

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.MedCheckWork;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author songxl
- * @since 2021-05-11
- */
-public interface MedCheckWorkService extends IService<MedCheckWork> {
-
-}

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

@@ -1,27 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.CheckWorkDTO;
-import com.diagbot.entity.MedCheckWork;
-import com.diagbot.mapper.MedCheckWorkMapper;
-import com.diagbot.service.MedCheckWorkService;
-import com.diagbot.vo.CheckWorkPageVO;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author songxl
- * @since 2021-05-11
- */
-@Service
-public class MedCheckWorkServiceImpl extends ServiceImpl<MedCheckWorkMapper, MedCheckWork> implements MedCheckWorkService {
-
-    public IPage<CheckWorkDTO> getCheckWorkPage(CheckWorkPageVO checkWorkPageVO) {
-        return baseMapper.getCheckWorkPage(checkWorkPageVO);
-    }
-
-}

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

@@ -10,6 +10,7 @@ import com.diagbot.vo.CheckJobVO;
 import com.diagbot.vo.MedCheckInfoAddVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,6 +41,7 @@ public class MedCheckInfoController {
             notes = "核查数据接口")
     @PostMapping("/addMedCheckInfo")
     @SysLogger("addMedCheckInfo")
+    @Ignore
     public RespDTO<Boolean> addMedCheckInfo(@RequestBody MedCheckInfoAddVO medCheckInfoAddVO) {
         Boolean res = medCheckInfoFacade.addMedCheckInfos(medCheckInfoAddVO);
         return RespDTO.onSuc(res);

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

@@ -27,13 +27,13 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/check")
-@Api(value = "核查任务数据模块相关接口API", tags = { "核查任务数据模块相关接口API" })
+@Api(value = "生成核查任务--相关接口API", tags = { "生成核查任务--相关接口API" })
 public class MedCheckWorkController {
     @Autowired
     MedCheckWorkFacade medCheckworkFacade;
 
-    @ApiOperation(value = "生成核查任务[by:songxl]",
-            notes = "生成核查任务")
+    @ApiOperation(value = "生成/取消核查任务[by:songxl]",
+            notes = "生成/取消核查任务")
     @PostMapping("/addCheck")
     @SysLogger("addCheck")
     public RespDTO<Boolean> addMedCheckInfo(@RequestBody MedCheckWorkAddVO medCheckWorkVO) {
@@ -41,7 +41,7 @@ public class MedCheckWorkController {
         return RespDTO.onSuc(res);
     }
 
-    @ApiOperation(value = "核查任务列表[by:wangsy]",
+    @ApiOperation(value = "获取患者病历列表[by:wangsy]",
             notes = "startDate：出院开始时间 【必填】<br>" +
                     "endDate：出院结束时间 【必填】<br>" +
                     "creatStatus：生成状态(0-未生成 1-已生成) 【必填】<br>" +

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -85,4 +85,78 @@
         ) a LEFT JOIN med_behospital_type b on a.behospital_code = b.behospital_code
         and a.hospital_id = b.hospital_id and b.is_deleted = 'N' ORDER BY b.`value` DESC ,a.leave_hospital_date DESC
     </select>
+
+    <select id="getCheckWorkPage" resultType="com.diagbot.dto.CheckWorkDTO">
+        SELECT
+        mbi.behospital_code,
+        mbi.name,
+        mbi.file_code,
+        mbi.sex,
+        mhp.age,
+        mbi.beh_dept_name,
+        mbi.leave_hospital_date,
+        mhp.behospital_day_num,
+        mbi.doctor_name,
+        mqi.level,
+        mbi.diagnose,
+        CASE WHEN mbt.behospital_type='出院病人' THEN '6'
+        WHEN mbt.behospital_type='死亡病人' THEN '6'
+        WHEN mbt.behospital_type='危重病人' THEN '4'
+        WHEN mbt.behospital_type='抢救病人' THEN '5'
+        WHEN mbt.behospital_type='手术病人' THEN '2'
+        WHEN mbt.behospital_type='疑难病人' THEN '3'
+        WHEN mbt.behospital_type='输血病人' THEN '4' ELSE '0' END AS score,
+        CASE WHEN ISNULL(mci.job_create_time) THEN '未生成' ELSE '已生成' END AS creatStatus,
+        mci.job_create_time
+        FROM
+        med_behospital_info mbi
+        LEFT JOIN med_home_page mhp
+        ON mbi.behospital_code=mhp.behospital_code
+        AND mbi.hospital_id = mhp.hospital_id
+        LEFT JOIN med_check_info mci
+        ON mbi.behospital_code = mci.behospital_code
+        AND mbi.hospital_id = mci.hospital_id AND mci.is_deleted = 'N'
+        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
+        AND mbi.hospital_id = mbt.hospital_id AND mbt.is_deleted = 'N'
+        WHERE mbi.is_deleted = 'N'
+        <if test="startDate != null">
+            <![CDATA[ AND mbi.behospital_date >= #{startDate}]]>
+        </if>
+        <if test="endDate != null">
+            <![CDATA[ AND mbi.behospital_date < #{endDate}]]>
+        </if>
+        <if test="creatStatus != null and creatStatus != ''">
+            AND mci.create_status = #{creatStatus}
+        </if>
+        <if test="name != null and name != ''">
+            AND mbi.name like CONCAT('%',#{name},'%')
+        </if>
+        <if test="behospitalCode != null and behospitalCode != ''">
+            AND mbi.behospital_code like CONCAT('%',#{behospitalCode},'%')
+        </if>
+        <if test="department != null and department != ''">
+            AND mbi.beh_dept_name like CONCAT('%',#{department},'%')
+        </if>
+        <if test="sDay != null">
+            <![CDATA[ AND mhp.behospital_day_num >= #{sDay}]]>
+        </if>
+        <if test="lDay != null">
+            <![CDATA[ AND hp.behospital_day_num < #{lDay}]]>
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND mbi.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+        </if>
+        <if test="diagnose != null and diagnose != ''">
+            AND mbi.diagnose LIKE CONCAT( '%', #{diagnose}, '%' )
+        </if>
+        <if test="level != null and level != ''">
+            AND mqi.level= #{level}
+        </if>
+        <if test="isPlacefile != null and isPlacefile != ''">
+            AND mbi.is_placefile = #{isPlacefile}
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper/MedCheckWorkMapper.xml

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.MedCheckWorkMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedCheckWork">
-        <id column="id" property="id" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="behospital_code" property="behospitalCode" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="check_user" property="checkUser" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="check_time" property="checkTime" />
-        <result column="work_type" property="workType" />
-        <result column="distribution" property="distribution" />
-        <result column="check_status" property="checkStatus" />
-        <result column="is_deleted" property="isDeleted" />
-    </resultMap>
-
-
-    <select id="getCheckWorkPage" resultType="com.diagbot.dto.CheckWorkDTO">
-        SELECT
-        mbi.behospital_code,
-        mbi.name,
-        mbi.file_code,
-        mbi.sex,
-        mhp.age,
-        mbi.beh_dept_name,
-        mbi.leave_hospital_date,
-        mhp.behospital_day_num,
-        mbi.doctor_name,
-        mqi.level,
-        mbi.diagnose,
-        CASE WHEN mbt.behospital_type='出院病人' THEN '6'
-             WHEN mbt.behospital_type='死亡病人' THEN '6'
-             WHEN mbt.behospital_type='危重病人' THEN '4'
-             WHEN mbt.behospital_type='抢救病人' THEN '5'
-             WHEN mbt.behospital_type='手术病人' THEN '2'
-             WHEN mbt.behospital_type='疑难病人' THEN '3'
-             WHEN mbt.behospital_type='输血病人' THEN '4' ELSE '0' END AS score,
-        CASE WHEN ISNULL(mci.job_create_time) THEN '未生成' ELSE '已生成' END AS creatStatus,
-        mci.job_create_time
-        FROM
-        med_behospital_info mbi
-        LEFT JOIN med_home_page mhp
-        ON mbi.behospital_code=mhp.behospital_code
-        AND mbi.hospital_id = mhp.hospital_id
-        LEFT JOIN med_check_info mci
-        ON mbi.behospital_code = mci.behospital_code
-        AND mbi.hospital_id = mci.hospital_id AND mci.is_deleted = 'N'
-        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
-        AND mbi.hospital_id = mbt.hospital_id AND mbt.is_deleted = 'N'
-        WHERE mbi.is_deleted = 'N'
-        <if test="startDate != null">
-            <![CDATA[ AND mbi.behospital_date >= #{startDate}]]>
-        </if>
-        <if test="endDate != null">
-            <![CDATA[ AND mbi.behospital_date < #{endDate}]]>
-        </if>
-        <if test="creatStatus != null and creatStatus != ''">
-            AND mci.create_status = #{creatStatus}
-        </if>
-        <if test="name != null and name != ''">
-            AND mbi.name like CONCAT('%',#{name},'%')
-        </if>
-        <if test="behospitalCode != null and behospitalCode != ''">
-            AND mbi.behospital_code like CONCAT('%',#{behospitalCode},'%')
-        </if>
-        <if test="department != null and department != ''">
-            AND mbi.beh_dept_name like CONCAT('%',#{department},'%')
-        </if>
-        <if test="sDay != null">
-            <![CDATA[ AND mhp.behospital_day_num >= #{sDay}]]>
-        </if>
-        <if test="lDay != null">
-            <![CDATA[ AND hp.behospital_day_num < #{lDay}]]>
-        </if>
-        <if test="doctorName != null and doctorName != ''">
-            AND mbi.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
-        </if>
-        <if test="diagnose != null and diagnose != ''">
-            AND mbi.diagnose LIKE CONCAT( '%', #{diagnose}, '%' )
-        </if>
-        <if test="level != null and level != ''">
-            AND mqi.level= #{level}
-        </if>
-        <if test="isPlacefile != null and isPlacefile != ''">
-            AND mbi.is_placefile = #{isPlacefile}
-        </if>
-    </select>
-
-</mapper>