From fa8dce53106f77c22d52d2c1da251ea2c41ab9b8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 06 三月 2024 11:56:26 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/PatArchive.java |   90 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index fdd19ae..53cfd03 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -1,6 +1,7 @@
 package com.smartor.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiImplicitParam;
@@ -26,7 +27,7 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty("鑷ID")
     private Long patid;
 
     /**
@@ -44,11 +45,43 @@
     private Long sex;
 
     /**
+     * 璇佷欢绫诲瀷
+     */
+    @ApiModelProperty("璇佷欢绫诲瀷")
+    @Excel(name = " 璇佷欢绫诲瀷 ")
+    private String idcardtype;
+
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("绫嶈疮")
+    @Excel(name = " 绫嶈疮 ")
+    private String nativePlace;
+
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("灞呬綇鍦�")
+    @Excel(name = " 灞呬綇鍦� ")
+    private String placeOfResidence;
+
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("鍑虹敓鍦�")
+    @Excel(name = " 鍑虹敓鍦� ")
+    private String birthplace;
+
+
+    /**
      * 璇佷欢鍙风爜
      */
     @ApiModelProperty("璇佷欢鍙风爜")
     @Excel(name = " 璇佷欢鍙风爜 ")
-    private String iccardno;
+    private String idcardno;
 
     /**
      * 鐢熸棩
@@ -76,12 +109,14 @@
      * 寤烘。鏃堕棿
      */
     @ApiModelProperty("寤烘。鏃堕棿")
+    @Excel(name = " 寤烘。鏃堕棿 ")
     private Date archivetime;
 
     /**
      * 寤烘。浜�
      */
     @ApiModelProperty("寤烘。浜�")
+    @Excel(name = " 寤烘。浜� ")
     private String archiveby;
 
     /**
@@ -91,17 +126,20 @@
     @Excel(name = " 鎵嬫満鍙风爜 ")
     private String telcode;
 
+
     /**
      * 浜插睘鍙风爜
      */
     @ApiModelProperty("浜插睘鍙风爜")
+    @Excel(name = " 浜插睘鍙风爜 ")
     private String relativetelcode;
 
     /**
-     * 璇佷欢绫诲瀷
+     * 姘戞棌
      */
-    @ApiModelProperty("璇佷欢绫诲瀷")
-    private String iccardtype;
+    @ApiModelProperty("姘戞棌")
+    @Excel(name = " 姘戞棌 ")
+    private String nation;
 
     /**
      * 鏈烘瀯ID
@@ -114,6 +152,7 @@
      * 寰俊openid
      */
     @ApiModelProperty("寰俊openid")
+    @Excel(name = " 寰俊openid ")
     private String openid;
 
     /**
@@ -138,10 +177,49 @@
      * 鏍囩
      */
     @ApiModelProperty("鏍囩")
+    @Excel(name = " 鏍囩 ", cellType = Excel.ColumnType.STRING)
     private String tag;
+
+    /**
+     * 鏍囩
+     */
+    @ApiModelProperty("鏍囩id")
+    @Excel(name = " 鏍囩id ", cellType = Excel.ColumnType.STRING)
+    private Long tagid;
+
+    @ApiModelProperty("鏍囩闆嗗悎")
+    private List<PatArchivetag> tagList;
+
+    /**
+     * 鏍囩
+     */
+    @ApiModelProperty("鎮ｈ�呯被鍨�")
+    @Excel(name = " 鎮ｈ�呯被鍨� ", cellType = Excel.ColumnType.STRING)
+    private String pattype;
+
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("閽夐拤鍙�")
+    @Excel(name = " 閽夐拤鍙� ")
+    private String dduserid;
+
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("绉戝")
+    @Excel(name = " 绉戝 ")
+    private String dept;
+
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("绉戝")
+    @Excel(name = " 绉戝 ")
+    private String bedNo;
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("iccardno", getIccardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("iccardtype", getIccardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("idcardno", getIdcardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("idcardtype", getIdcardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
     }
 }

--
Gitblit v1.9.3