添加核查分配列表接口

src/main/java/com/diagbot/dto/GetDeptDistributionDTO.java

@@ -0,0 +1,89 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 任务分配-科室列表页分页接口-接口出参
+ * @Author songxl
+ * @Date 2022/4/11 9:20
+ */
+@ApiModel(value = "任务分配-科室列表页分页接口-接口出参")
+@Getter
+@Setter
+public class GetDeptDistributionDTO implements Serializable {
+    private static final long serialVersionUID = 2887264914225402143L;
+
+    @ApiModelProperty(value = "病人住院序号")
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "患者姓名")
+    private String name;
+
+    @ApiModelProperty(value = "档案号")
+    private String fileCode;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+
+    @ApiModelProperty(value = "年龄")
+    private String age = "";
+
+    @ApiModelProperty(value = "科室")
+    private String behDeptName;
+
+    @ApiModelProperty(value = "入院时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date behospitalDate;
+
+    @ApiModelProperty(value = "出院时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date leaveHospitalDate;
+
+    @ApiModelProperty(value = "住院天数")
+    private String behospitalDayNum;
+
+    @ApiModelProperty(value = "主管医生")
+    private String doctorName;
+
+    @ApiModelProperty(value = "病历得分")
+    private Double scoreRes;
+
+    @ApiModelProperty(value = "病历等级")
+    private String level;
+
+    @ApiModelProperty(value = "主诊断")
+    private String diagnose;
+
+    @ApiModelProperty(value = "病历类型")
+    private String behospitalType;
+
+    @ApiModelProperty(value = "病历类型对应分值")
+    private String value;
+
+    @ApiModelProperty(value = "科室核查状态")
+    private String deptCheckStatus;
+
+    @ApiModelProperty(value = "科室核查人")
+    private String deptChName;
+
+    @ApiModelProperty(value = "院级核查状态")
+    private String hospCheckStatus;
+
+    @ApiModelProperty(value = "院级核查人")
+    private String hospChName;
+
+    @ApiModelProperty(value = "质控科核查状态")
+    private String quatCheckStatus;
+
+    @ApiModelProperty(value = "质控科核查人")
+    private String quatChName;
+
+
+}

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

@@ -3,6 +3,10 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -15,6 +19,9 @@ import java.io.Serializable;
  * @since 2022-05-18
  */
 @TableName("med_check_record")
+@Getter
+@Setter
+@ToString
 public class CheckRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -80,6 +87,11 @@ public class CheckRecord implements Serializable {
      */
     private Long workFlowNodeId;
 
+    /**
+     * 任务截止日期
+     */
+    private Long jobEndTime;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */
@@ -110,154 +122,4 @@ public class CheckRecord implements Serializable {
      */
     private String remark;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getCheckType() {
-        return checkType;
-    }
-
-    public void setCheckType(String checkType) {
-        this.checkType = checkType;
-    }
-    public Long getJobCreator() {
-        return jobCreator;
-    }
-
-    public void setJobCreator(Long jobCreator) {
-        this.jobCreator = jobCreator;
-    }
-    public String getJobCreatorName() {
-        return jobCreatorName;
-    }
-
-    public void setJobCreatorName(String jobCreatorName) {
-        this.jobCreatorName = jobCreatorName;
-    }
-    public LocalDateTime getJobCreateTime() {
-        return jobCreateTime;
-    }
-
-    public void setJobCreateTime(LocalDateTime jobCreateTime) {
-        this.jobCreateTime = jobCreateTime;
-    }
-    public String getJobType() {
-        return jobType;
-    }
-
-    public void setJobType(String jobType) {
-        this.jobType = jobType;
-    }
-    public Long getJobDistributor() {
-        return jobDistributor;
-    }
-
-    public void setJobDistributor(Long jobDistributor) {
-        this.jobDistributor = jobDistributor;
-    }
-    public String getJobDistributionName() {
-        return jobDistributionName;
-    }
-
-    public void setJobDistributionName(String jobDistributionName) {
-        this.jobDistributionName = jobDistributionName;
-    }
-    public LocalDateTime getJobDistributionTime() {
-        return jobDistributionTime;
-    }
-
-    public void setJobDistributionTime(LocalDateTime jobDistributionTime) {
-        this.jobDistributionTime = jobDistributionTime;
-    }
-    public Long getWorkFlowNodeId() {
-        return workFlowNodeId;
-    }
-
-    public void setWorkFlowNodeId(Long workFlowNodeId) {
-        this.workFlowNodeId = workFlowNodeId;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public LocalDateTime getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(LocalDateTime gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public LocalDateTime getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(LocalDateTime gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "CheckRecord{" +
-            "id=" + id +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", checkType=" + checkType +
-            ", jobCreator=" + jobCreator +
-            ", jobCreatorName=" + jobCreatorName +
-            ", jobCreateTime=" + jobCreateTime +
-            ", jobType=" + jobType +
-            ", jobDistributor=" + jobDistributor +
-            ", jobDistributionName=" + jobDistributionName +
-            ", jobDistributionTime=" + jobDistributionTime +
-            ", workFlowNodeId=" + workFlowNodeId +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", remark=" + remark +
-        "}";
-    }
 }

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

@@ -2,9 +2,11 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetCheckRecordPageDTO;
+import com.diagbot.dto.GetDeptDistributionDTO;
 import com.diagbot.entity.CheckRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.GetCheckRecordPageVO;
+import com.diagbot.vo.GetDeptDistributionVO;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -17,4 +19,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface CheckRecordMapper extends BaseMapper<CheckRecord> {
     IPage<GetCheckRecordPageDTO>  getCheckRecordPage(@Param("getCheckRecordPagevo") GetCheckRecordPageVO getCheckRecordPagevo);
+
+    IPage<GetDeptDistributionDTO> getDeptDistributionPage(@Param("getDeptDistributionVO") GetDeptDistributionVO getDeptDistributionVO);
 }

src/main/java/com/diagbot/vo/GetDeptDistributionVO.java

@@ -0,0 +1,84 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 任务分配-科室列表页分页接口-接口入参
+ * @Author songxl
+ * @Date 2022/5/23 9:20
+ */
+@ApiModel(value = "任务分配-科室列表页分页接口-接口入参")
+@Getter
+@Setter
+public class GetDeptDistributionVO extends Page implements Serializable {
+    private static final long serialVersionUID = -4950067898393122612L;
+
+    @ApiModelProperty(value = "是否归档（0：未归档，1：已归档）", required = true)
+    @NotBlank(message = "是否归档为空")
+    private String isPlacefile = "1";
+
+    @ApiModelProperty(value = "医院ID",hidden = true)
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "入院时间开始时间")
+    private Date behosDateStart;
+
+    @ApiModelProperty(value = "入院时间结束时间")
+    private Date behosDateEnd;
+
+    @ApiModelProperty(value = "出院时间开始时间")
+    private Date leaveHosDateStart;
+
+    @ApiModelProperty(value = "出院时间结束时间")
+    private Date leaveHosDateEnd;
+
+    @ApiModelProperty(value = "病人住院ID")
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "病人姓名")
+    private String name;
+
+    @ApiModelProperty(value = "住院科室名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "住院天数")
+    private String behospitalDayNum;
+
+    @ApiModelProperty(value = "医生姓名")
+    private String doctorName;
+
+    @ApiModelProperty(value = "医生工号")
+    private String doctorCode;
+
+    @ApiModelProperty(value = "主诊断")
+    private String diagnose;
+
+    @ApiModelProperty(value = "病历等级")
+    private String level;
+
+    @ApiModelProperty(value = "病历类型")
+    private String behospitalType;
+
+    @ApiModelProperty(hidden = true)
+    private Long userId;
+
+    private String deptId;
+
+    @ApiModelProperty(value = "科室核查状态")
+    private String deptCheckStatus;
+
+    @ApiModelProperty(value = "院级核查状态")
+    private String hospCheckStatus;
+
+    @ApiModelProperty(value = "质控科核查状态")
+    private String quatCheckStatus;
+
+}

src/main/resources/mapper/CheckRecordMapper.xml

@@ -16,6 +16,7 @@
         <result column="job_distribution_name" property="jobDistributionName"/>
         <result column="job_distribution_time" property="jobDistributionTime"/>
         <result column="work_flow_node_id" property="workFlowNodeId"/>
+        <result column="job_end_time" property="jobEndTime"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>