From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java |  590 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 553 insertions(+), 37 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
index 6e60c6e..9042b18 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
@@ -1,90 +1,606 @@
 package com.ruoyi.project.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
 @Data
-public class EthicalReviewVO {
+public class EthicalReviewVO extends BaseEntity {
 
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+    @TableId(type = IdType.AUTO)
     private Long id;
-    private String donorno;
-    private String recordstate;
+
+    /**
+     * 濮撳悕
+     */
+    @ApiModelProperty("濮撳悕")
+    @Excel(name = "濮撳悕")
     private String name;
+
+    /**
+     * 鎬у埆
+     */
+    @ApiModelProperty("鎬у埆")
     private String sex;
-    //private Long idcardtype;
+
+    /**
+     * 璇佷欢绫诲瀷
+     */
+    @ApiModelProperty("璇佷欢绫诲瀷")
+    private Long idcardtype;
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("璇佷欢鍙风爜")
     private String idcardno;
+
+    /**
+     * 骞撮緞
+     */
+    @ApiModelProperty("骞撮緞")
     private Long age;
-    private String birthday;
+
+    /**
+     * 骞撮緞鍗曚綅
+     */
+    @ApiModelProperty("骞撮緞鍗曚綅")
+    private String ageunit;
+    /**
+     * 骞撮緞2
+     */
+    @ApiModelProperty("骞撮緞2")
+    private Long age2;
+
+    /**
+     * 骞撮緞鍗曚綅2
+     */
+    @ApiModelProperty("骞撮緞鍗曚綅2")
+    private String ageunit2;
+
+    /**
+     * 鍑虹敓鏃ユ湡
+     */
+    @ApiModelProperty("鍑虹敓鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthday;
+
+    /**
+     * 鑱旂郴鐢佃瘽
+     */
+    @ApiModelProperty("鑱旂郴鐢佃瘽")
+    private String phone;
+
+    /**
+     * 鐜颁綇鍦板潃
+     */
+    @ApiModelProperty("鐜颁綇鍦板潃")
+    private String residenceaddress;
+
+    /**
+     * 鍥界睄
+     */
+    @ApiModelProperty("鍥界睄")
     private String nationality;
+
+    /**
+     * 鐪�(鍖�/甯�)
+     */
+    @ApiModelProperty("鐪�(鍖�/甯�)")
+    @Excel(name = "鐪�(鍖�/甯�)")
+    private String residenceprovince;
+
+    /**
+     * 绫嶈疮
+     */
+    @ApiModelProperty("绫嶈疮")
+    @Excel(name = "绫嶈疮")
+    private String nativeplace;
+
+    /**
+     * 鐜颁綇鍦板潃鐪佸悕绉�
+     */
+    @ApiModelProperty("鐜颁綇鍦板潃鐪佸悕绉�")
+    private String residenceprovincename;
+
+    /**
+     * 姘戞棌
+     */
+    @ApiModelProperty("姘戞棌")
     private String nation;
+
+    /**
+     * 鑱屼笟
+     */
+    @ApiModelProperty("鑱屼笟")
+    private String occupation;
+
+    /**
+     * 甯�(宸�)
+     */
+    @ApiModelProperty("甯�(宸�)")
+    private String residencecity;
+
+    /**
+     * 甯傚悕绉�
+     */
+    @ApiModelProperty("甯傚悕绉�")
+    private String residencecityname;
+
+    /**
+     * 瀛﹀巻
+     */
+    @ApiModelProperty("瀛﹀巻")
+    private String education;
+
+    /**
+     * 鍘匡紙甯�/鍖猴級
+     */
+    @ApiModelProperty("鍘匡紙甯�/鍖猴級")
+    private String residencetown;
+
+    /**
+     * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+     */
+    @ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
+    private String residencetownname;
+
+    /**
+     * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+     */
+    @ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+    private String residencecommunity;
+
+    /**
+     * 绀惧尯锛堟潙锛夊悕绉�
+     */
+    @ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
+    private String residencecommunityname;
+
+    /**
+     * 鎵�灞炲尯鍩熺紪鍙�  鏍规嵁琛屾斂鍖哄垝琛�
+     */
+    @ApiModelProperty("鎵�灞炲尯鍩熺紪鍙�  鏍规嵁琛屾斂鍖哄垝琛�")
+    private String residencecountycode;
+
+    /**
+     * 鎵�灞炲尯鍩熷悕绉�
+     */
+    @ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
+    private String residencecountyname;
+
+    /**
+     * 鎴风睄鍦板潃
+     */
+    @ApiModelProperty("鎴风睄鍦板潃")
     private String registeraddress;
+
+    /**
+     * 鐪�(鍖�/甯�)
+     */
+    @ApiModelProperty("鐪�(鍖�/甯�)")
     private String registerprovince;
+
+    /**
+     * 鎴风睄鍦板潃鐪佸悕绉�
+     */
+    @ApiModelProperty("鎴风睄鍦板潃鐪佸悕绉�")
     private String registerprovincename;
+
+    /**
+     * 甯�(宸�)
+     */
+    @ApiModelProperty("甯�(宸�)")
     private String registercity;
+
+    /**
+     * 甯傚悕绉�
+     */
+    @ApiModelProperty("甯傚悕绉�")
     private String registercityname;
+
+    /**
+     * 鍘匡紙甯�/鍖猴級
+     */
+    @ApiModelProperty("鍘匡紙甯�/鍖猴級")
     private String registertown;
+
+    /**
+     * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+     */
+    @ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
     private String registertownname;
+
+    /**
+     * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+     */
+    @ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
     private String registercommunity;
+
+    /**
+     * 绀惧尯锛堟潙锛夊悕绉�
+     */
+    @ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
     private String registercommunityname;
+
+    /**
+     * 鎵�灞炲尯鍩熺紪鍙�  鏍规嵁琛屾斂鍖哄垝琛�
+     */
+    @ApiModelProperty("鎵�灞炲尯鍩熺紪鍙�  鏍规嵁琛屾斂鍖哄垝琛�")
     private String registercountycode;
+
+    /**
+     * 鎵�灞炲尯鍩熷悕绉�
+     */
+    @ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
     private String registercountyname;
+
+    /**
+     * 璁板綍鐘舵��
+     */
+    @ApiModelProperty("璁板綍鐘舵��")
+    @Excel(name = "璁板綍鐘舵��")
+    private String recordstate;
+
+    /**
+     * 娌荤枟鍖婚櫌
+     */
+    @ApiModelProperty("娌荤枟鍖婚櫌")
     private String treatmenthospitalno;
+
+    /**
+     * 鎵�鍦ㄥ尰鐤楁満鏋�
+     */
+    @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋�")
+    @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋�")
     private String treatmenthospitalname;
+
+    /**
+     * 绉戝
+     */
+    @ApiModelProperty("绉戝")
     private String treatmentdeptname;
+
+    /**
+     * 鐤剧梾璇婃柇
+     */
+    @ApiModelProperty("鐤剧梾璇婃柇")
     private String diagnosisno;
+
+    /**
+     * 鐤剧梾璇婃柇鍚嶇О
+     */
+    @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
     private String diagnosisname;
-    private String reporterno;
-    private String reportername;
-    private String reporterphone;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date reporttime;
+
+    /**
+     * 琛�鍨�
+     */
+    @ApiModelProperty("琛�鍨� ")
     private String bloodtype;
-    private Long rhyin;
+
+    /**
+     * 浣忛櫌鍙�
+     */
+    @ApiModelProperty("浣忛櫌鍙�")
     private String inpatientno;
+
+    /**
+     * Rh闃存��
+     */
+    @ApiModelProperty("Rh闃存��")
+    private String rhyin;
+
+    /**
+     * 鎹愮尞鑰呯紪鍙�
+     */
+    @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+    private String donorno;
+
+    /**
+     * 鎹愮尞绫诲埆
+     */
+    @ApiModelProperty("鎹愮尞绫诲埆")
+    private String donationcategory;
+
+    /**
+     * 鐥呮儏姒傚喌
+     */
+    @ApiModelProperty("鐥呮儏姒傚喌")
     private String illnessoverview;
+
+    /**
+     * 鐤剧梾绫诲瀷
+     */
+    @ApiModelProperty("鐤剧梾绫诲瀷")
     private String diseasetype;
+
+    /**
+     * 浼犳煋鐥呮儏鍐�
+     */
+    @ApiModelProperty("浼犳煋鐥呮儏鍐�")
+    private String infectious;
+
+    /**
+     * 鏈汉鎰忔効
+     */
+    @ApiModelProperty("鏈汉鎰忔効 ")
+    private String selfwill;
+
+    /**
+     * 鍏朵粬鎯呭喌
+     */
+    @ApiModelProperty("鍏朵粬鎯呭喌")
+    private String othercases;
+
+    /**
+     * 浜插睘鎰忔効
+     */
+    @ApiModelProperty("浜插睘鎰忔効")
+    private Long kinshipwill;
+
+    /**
+     * 鍏朵粬
+     */
+    @ApiModelProperty("鍏朵粬")
+    private String diseasetypeOther;
+
+    /**
+     * 浜插睘鍏崇郴鐘跺喌
+     */
+    @ApiModelProperty("浜插睘鍏崇郴鐘跺喌")
+    private String kinship;
+
+    /**
+     * 淇℃伅鏉ユ簮
+     */
+    @ApiModelProperty("淇℃伅鏉ユ簮")
+    private String infosources;
+
+    /**
+     * 绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛�
+     */
+    @ApiModelProperty("绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛�")
+    private String redorganno;
+
+    /**
+     * 绾㈠崄瀛椾細鏈烘瀯鍚嶇О
+     */
+    @ApiModelProperty("绾㈠崄瀛椾細鏈烘瀯鍚嶇О")
+    private String redorganname;
+
+    /**
+     * 绾㈠崄瀛椾細鑱旂郴浜�
+     */
+    @ApiModelProperty("绾㈠崄瀛椾細鑱旂郴浜�")
+    private String contactperson;
+
+    /**
+     * 鍏朵粬
+     */
+    @ApiModelProperty("鍏朵粬")
+    private String infectiousOther;
+
+    /**
+     * 绾㈠崄瀛椾細鑱旂郴鐢佃瘽
+     */
+    @ApiModelProperty("绾㈠崄瀛椾細鑱旂郴鐢佃瘽")
+    private String contactnumber;
+
+    /**
+     * 鎶ュ憡鑰呯紪鍙�
+     */
+    @ApiModelProperty("鎶ュ憡鑰呯紪鍙�")
+    private String reporterno;
+
+    /**
+     * 鎶ュ憡鑰呭鍚�
+     */
+    @ApiModelProperty("鎶ュ憡鑰呭鍚�")
+    @Excel(name = "鎶ュ憡鑰呭鍚�")
+    private String reportername;
+
+    /**
+     * 鐥呬汉鐘跺喌
+     */
+    @ApiModelProperty("鐥呬汉鐘跺喌")
     private String patientstate;
-    private Long fcid;
-//    private String expertopinion;
-//    private String expertconclusion;
-//    private String expertname;
-//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    private Date conclusiontime;
-//    private String conclusionannex;
-//    private String conclusionorder;
 
-    private Long infoid;
-    private String fcdonorno;
-    private String flowname;
-    private String flowannex;
-    private String flowcontent;
-    private String flowconclusion;
-    private Long delFlag;
-    private String createBy;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    private String updateBy;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTime;
+    /**
+     * 鎶ュ憡鑰呰仈绯荤數璇�
+     */
+    @ApiModelProperty("鎶ュ憡鑰呰仈绯荤數璇�")
+    private String reporterphone;
 
-    private String basecreateby;
+    /**
+     * 淇℃伅鏉ユ簮鍏朵粬
+     */
+    @ApiModelProperty("淇℃伅鏉ユ簮鍏朵粬")
+    private String infosourcesOther;
+
+    /**
+     * 鎶ュ憡鏃堕棿
+     */
+    @ApiModelProperty("鎶ュ憡鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date reporttime;
+
+    /**
+     * 鍏朵粬
+     */
+    @ApiModelProperty("鍏朵粬")
+    private String kinshipOther;
+
+    /**
+     * 涓昏浜插睘
+     */
+    @ApiModelProperty("涓昏浜插睘")
+    private String majorrelatives;
+
+    /**
+     * 涓庢崘璧犺�呭叧绯�
+     */
+    @ApiModelProperty("涓庢崘璧犺�呭叧绯�")
+    private String familyrelations;
+
+    /**
+     * 鑾峰彇缁勭粐缂栧彿
+     */
+    @ApiModelProperty("鑾峰彇缁勭粐缂栧彿")
+    private String acquisitiontissueno;
+
+    /**
+     * 鑾峰彇缁勭粐鍚嶇О
+     */
+    @ApiModelProperty("鑾峰彇缁勭粐鍚嶇О")
+    private String acquisitiontissuename;
+
+    /**
+     * 淇℃伅鍛樺鍚�
+     */
+    @ApiModelProperty("淇℃伅鍛樺鍚�")
+    private String infoname;
+
+    /**
+     * 淇℃伅鍛樿仈绯绘柟寮�
+     */
+    @ApiModelProperty("淇℃伅鍛樿仈绯绘柟寮�")
+    private String infophone;
+
+    /**
+     * 鑱旂郴鏃堕棿
+     */
+    @ApiModelProperty("鑱旂郴鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date contacttime;
+
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(exist = false)
     private Date starttime;
 
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(exist = false)
     private Date endtime;
+
+    @TableField(exist = false)
     private String city;
+
+
+    private Long deptid;
+
+    @ApiModelProperty("閮ㄩ棬鍚嶇О")
+    @Excel(name = "閮ㄩ棬鍚嶇О")
+    private String deptname;
+
+    @ApiModelProperty("缁勯暱缂栫爜")
+    @Excel(name = "缁勯暱缂栫爜")
+    private String leaderno;
+
+    @ApiModelProperty("缁勯暱鍚嶇О")
+    @Excel(name = "缁勯暱鍚嶇О")
+    private String leadername;
+
+    @ApiModelProperty("涓氬姟鍦板尯")
+    @Excel(name = "涓氬姟鍦板尯")
+    private String businessarea;
+
+
+    @ApiModelProperty("闄勪欢鍦板潃")
+    @Excel(name = "闄勪欢鍦板潃")
+    private String annexfiles;
+
+
+    @ApiModelProperty("宸ヤ綔娴�")
+    @Excel(name = "宸ヤ綔娴�")
     private Integer workflow;
+
+
+    @ApiModelProperty("缁堟妗堜緥锛�0寮�鍚紝1缁堟    榛樿鍊硷細0")
+    @Excel(name = "缁堟妗堜緥")
     private Integer terminationCase;
+
+    @ApiModelProperty("妗堜緥鏃堕棿")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date donatetime;
+
+    @ApiModelProperty("妗堜緥搴忓彿")
+    private String donateno;
+
+    @ApiModelProperty("service_ethicalreviewopinions鐨勪富閿�")
+    private Long fcid;
+
+    @ApiModelProperty("delFlag")
+    private Long delFlag;
+
+    /**
+     * 涓撳鎰忚
+     */
+    @ApiModelProperty("涓撳鎰忚")
+    @Excel(name = "涓撳鎰忚")
+    private String expertopinion;
+
+    /**
+     * 涓撳缁撹  瑙佸瓧鍏� sys_0_1
+     */
+    @ApiModelProperty("涓撳缁撹  瑙佸瓧鍏� sys_0_1 ")
+    @Excel(name = "涓撳缁撹  瑙佸瓧鍏� sys_0_1 ")
+    private Long expertconclusion;
+
+
+    /**
+     * 涓撳鍚嶅瓧
+     */
+    @ApiModelProperty("涓撳鍚嶅瓧")
+    @Excel(name = "涓撳鍚嶅瓧")
+    private String expertname;
+
+    /**
+     * 缁撹鏃堕棿
+     */
+    @ApiModelProperty("缁撹鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "缁撹鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date conclusiontime;
+
+    /**
+     * 缁撹闄勪欢 鍙┖ 澶氫釜鐢�;鍙烽殧寮�
+     */
+    @ApiModelProperty("缁撹闄勪欢 鍙┖ 澶氫釜鐢�;鍙烽殧寮�")
+    @Excel(name = "缁撹闄勪欢 鍙┖ 澶氫釜鐢�;鍙烽殧寮�")
+    private String conclusionannex;
+
+
+    /**
+     * 缁撹椤哄簭
+     */
+    @ApiModelProperty("缁撹椤哄簭")
+    @Excel(name = "缁撹椤哄簭")
+    private Long conclusionorder;
+
+    /**
+     * Basecreateby
+     */
+    @ApiModelProperty("Basecreateby")
+    @TableField(exist = false)
+    private String basecreateby;
+
 }

--
Gitblit v1.9.3