From d43c7efe7ce9ddc1bbc09c9fede715ed85b6bb56 Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Fri, 20 Jun 2025 10:30:31 +0800 Subject: [PATCH] 1 --- .../server/entity/recovery/RcvBasic.java | 74 +++++++++++++++++ .../vo/recovery/rcvbasic/RcvBasicVO.java | 81 ++++++++++++++++++- 2 files changed, 154 insertions(+), 1 deletion(-) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/recovery/RcvBasic.java b/docus-client-interface/src/main/java/com/docus/server/entity/recovery/RcvBasic.java index 4ca2242..d6fb771 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/recovery/RcvBasic.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/recovery/RcvBasic.java @@ -34,6 +34,80 @@ import java.util.Date; @ApiModel(value = "RcvBasic对象", description = "患者信息表") public class RcvBasic implements Serializable { + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + + + + + @ApiModelProperty(value = "病案号") + @TableField("inpatient_no") + private String inpatientNo; + + @ApiModelProperty(value = "记账号(省中医住院就诊号)") + @TableField("jzh") + private String jzh; + + @ApiModelProperty(value = "住院号") + @TableField("admiss_id") + private String admissId; + + @ApiModelProperty(value = "流水号") + @TableField("serial_number") + private String serialNumber; + + @ApiModelProperty(value = "住院科室") + @TableField("admiss_dept") + private String admissDept; + + @ApiModelProperty(value = "住院科室名称") + @TableField("admiss_dept_name") + private String admissDeptName; + + @ApiModelProperty(value = "出院日期") + @TableField("dis_date") + private Date disDate; + + @ApiModelProperty(value = "出院科室") + @TableField("dis_dept") + private String disDept; + + @ApiModelProperty(value = "出院科室名称") + @TableField("dis_dept_name") + private String disDeptName; + + @ApiModelProperty(value = "实际住院天数") + @TableField("admiss_days") + private Integer admissDays; + + @ApiModelProperty(value = "住院医师") + @TableField("attending_name") + private String attendingName; + + @ApiModelProperty(value = "1 现场扫描，2 其他来源") + @TableField("file_source") + private Integer fileSource; + + + + @ApiModelProperty(value = "回收时间") + @TableField("revovery_time") + private Date revoveryTime; + + + + @ApiModelProperty(value = "修改时间") + @TableField("update_time") + private Date updateTime; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + + @ExcelIgnore @ApiModelProperty(value = "病案主键") private String patientId; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/recovery/rcvbasic/RcvBasicVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/recovery/rcvbasic/RcvBasicVO.java index feae140..d3667e0 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/recovery/rcvbasic/RcvBasicVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/recovery/rcvbasic/RcvBasicVO.java @@ -3,6 +3,9 @@ package com.docus.server.vo.recovery.rcvbasic; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.BaseRowModel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.docus.server.enums.RecoveryStateEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -27,6 +30,80 @@ import java.util.Date; @ApiModel(value = "RcvBasicVO对象", description = "患者信息表") public class RcvBasicVO extends BaseRowModel implements Serializable { + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + + + + + @ApiModelProperty(value = "病案号") + @TableField("inpatient_no") + private String inpatientNo; + + @ApiModelProperty(value = "记账号(省中医住院就诊号)") + @TableField("jzh") + private String jzh; + + @ApiModelProperty(value = "住院号") + @TableField("admiss_id") + private String admissId; + + @ApiModelProperty(value = "流水号") + @TableField("serial_number") + private String serialNumber; + + @ApiModelProperty(value = "住院科室") + @TableField("admiss_dept") + private String admissDept; + + @ApiModelProperty(value = "住院科室名称") + @TableField("admiss_dept_name") + private String admissDeptName; + + @ApiModelProperty(value = "出院日期") + @TableField("dis_date") + private Date disDate; + + @ApiModelProperty(value = "出院科室") + @TableField("dis_dept") + private String disDept; + + @ApiModelProperty(value = "出院科室名称") + @TableField("dis_dept_name") + private String disDeptName; + + @ApiModelProperty(value = "实际住院天数") + @TableField("admiss_days") + private Integer admissDays; + + @ApiModelProperty(value = "住院医师") + @TableField("attending_name") + private String attendingName; + + @ApiModelProperty(value = "1 现场扫描，2 其他来源") + @TableField("file_source") + private Integer fileSource; + + + + @ApiModelProperty(value = "回收时间") + @TableField("revovery_time") + private Date revoveryTime; + + + + @ApiModelProperty(value = "修改时间") + @TableField("update_time") + private Date updateTime; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + + @ExcelIgnore @ApiModelProperty(value = "病案主键") private String patientId; @@ -40,6 +117,9 @@ public class RcvBasicVO extends BaseRowModel implements Serializable { @ExcelIgnore @ApiModelProperty(value = "性别") private String sex; + @ExcelIgnore + @ApiModelProperty(value = "姓名") + private String name; @ExcelProperty(value = {"回收状态"}, index = 7, converter = GenderConverter.class) @ApiModelProperty(value = "回收状态 0：待回收 1：已回收") private RecoveryStateEnum recoveryState; @@ -52,5 +132,4 @@ public class RcvBasicVO extends BaseRowModel implements Serializable { @ExcelIgnore @ApiModelProperty(value = "出院天数") private String outNum; - }