From 5389773b2d1ae86daec68b00f67c3682dc907e01 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 十一月 2024 14:35:48 +0800
Subject: [PATCH] 代码提交(长期任务电话完成)

---
 smartor/src/main/java/com/smartor/domain/PatArchive.java |  149 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 137 insertions(+), 12 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index fbfa3e8..afc2400 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -28,7 +28,61 @@
      * 鑷ID
      */
     @ApiModelProperty("鑷ID")
-    private Long patid;
+    private Long id;
+
+    /**
+     * 鐖禝D
+     */
+    @ApiModelProperty("鐖禝D")
+    private Long pid;
+
+    /**
+     * GUID
+     */
+    @ApiModelProperty("GUID")
+    private String guid;
+
+    /**
+     * 濮撳悕
+     */
+    @ApiModelProperty("鎮h�呯紪鍙�")
+    @Excel(name = " 鎮h�呯紪鍙� ")
+    private String patientno;
+
+    /**
+     * 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�
+     */
+    @ApiModelProperty("鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�")
+    @Excel(name = " 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕� ")
+    private String notrequiredFlag;
+
+    /**
+     * 涓嶈鏈嶅姟鐨勫師鍥�
+     */
+    @ApiModelProperty("涓嶈鏈嶅姟鐨勫師鍥�")
+    @Excel(name = " 涓嶈鏈嶅姟鐨勫師鍥� ")
+    private String notrequiredreason;
+
+    /**
+     * 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級
+     */
+    @ApiModelProperty("鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級")
+    @Excel(name = " 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級 ")
+    private Integer sourcefrom;
+
+    /**
+     * his绯荤粺鐨勬偅鑰卛d
+     */
+    @ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
+    @Excel(name = "his绯荤粺鐨勬偅鑰卛d")
+    private Integer patidHis;
+
+    /**
+     * his绯荤粺鐨勬偅鑰卛d
+     */
+    @ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
+    @Excel(name = "his绯荤粺鐨勬偅鑰卛d")
+    private String sdFlag;
 
     /**
      * 濮撳悕
@@ -59,6 +113,11 @@
     @Excel(name = " 绫嶈疮 ")
     private String nativePlace;
 
+    /**
+     * 浣忛櫌鍙�
+     */
+    @ApiModelProperty(value = "浣忛櫌鍙�")
+    private String inhospno;
 
     /**
      * 璇佷欢鍙风爜
@@ -67,14 +126,12 @@
     @Excel(name = " 灞呬綇鍦� ")
     private String placeOfResidence;
 
-
     /**
      * 璇佷欢鍙风爜
      */
     @ApiModelProperty("鍑虹敓鍦�")
     @Excel(name = " 鍑虹敓鍦� ")
     private String birthplace;
-
 
     /**
      * 璇佷欢鍙风爜
@@ -105,13 +162,12 @@
     @ApiModelProperty("骞撮緞")
     @Excel(name = " 骞撮緞 ")
     private Long age;
-
     /**
-     * 鏉ユ簮
+     * 骞撮緞
      */
-    @ApiModelProperty("鏉ユ簮")
-    @Excel(name = " 鏉ユ簮 ")
-    private Long sourcefrom;
+    @ApiModelProperty("骞撮緞鍗曚綅")
+    @Excel(name = " 骞撮緞鍗曚綅 ")
+    private String ageUnit;
 
     /**
      * 寤烘。鏃堕棿
@@ -225,6 +281,26 @@
      */
     @ApiModelProperty("绉戝")
     @Excel(name = " 绉戝 ")
+    private String deptcode;
+    /**
+     * 鍖荤敓濮撳悕
+     */
+    @ApiModelProperty("鍖荤敓濮撳悕")
+    @Excel(name = " 鍖荤敓濮撳悕 ")
+    private String drname;
+
+    /**
+     * 鍖荤敓缂栫爜
+     */
+    @ApiModelProperty("鍖荤敓缂栫爜")
+    @Excel(name = " 鍖荤敓缂栫爜 ")
+    private String drcode;
+
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("绉戝")
+    @Excel(name = " 绉戝 ")
     private String bedNo;
 
     /**
@@ -234,8 +310,57 @@
     @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
     private String viptype;
 
-    @Override
-    public String 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("sourcefrom", getSourcefrom()).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();
-    }
+    @ApiModelProperty("鍑洪櫌鐥呭尯鍚嶇О")
+    private String leavehospitaldistrictname;
+
+    @ApiModelProperty("鍑洪櫌鐥呭尯缂栧彿")
+    private String leavehospitaldistrictcode;
+
+
+    /**
+     * 鍑洪櫌鏂瑰紡搴忓彿
+     */
+    @ApiModelProperty("鍑洪櫌鏂瑰紡搴忓彿")
+    @Excel(name = " 鍑洪櫌鏂瑰紡搴忓彿 ")
+    private String outWayId;
+
+    /**
+     * 鍑洪櫌鏂瑰紡鍚嶇О
+     */
+    @ApiModelProperty("鍑洪櫌鏂瑰紡鍚嶇О")
+    @Excel(name = " 鍑洪櫌鏂瑰紡鍚嶇О ")
+    private String outWayName;
+
+    @ApiModelProperty("鐓ф姢鍦烘墍锛�1瀹跺涵   2鍏昏�佹満鏋�")
+    @Excel(name = " 鐓ф姢鍦烘墍锛�1瀹跺涵   2鍏昏�佹満鏋� ")
+    private String careFacilities;
+
+    @ApiModelProperty("鐓ф姢鍦烘墍锛�1瀹跺涵   2鍏昏�佹満鏋�")
+    @Excel(name = " 鐓ф姢鍦烘墍锛�1瀹跺涵   2鍏昏�佹満鏋� ")
+    private String casePath;
+
+    @ApiModelProperty("鍙楁暀鑲茬▼搴�")
+    @Excel(name = "鍙楁暀鑲茬▼搴�")
+    private String degreeOfEducation;
+
+    @ApiModelProperty("濠氬Щ鐘跺喌")
+    @Excel(name = "濠氬Щ鐘跺喌")
+    private String maritalStatus;
+
+    @ApiModelProperty("瀹跺涵浜哄潎鏀跺叆")
+    @Excel(name = "瀹跺涵浜哄潎鏀跺叆")
+    private String income;
+
+    @ApiModelProperty("鍖讳繚绫诲瀷")
+    @Excel(name = "鍖讳繚绫诲瀷")
+    private String medicareType;
+
+    @ApiModelProperty("涓昏鐓ф姢浜�")
+    @Excel(name = "涓昏鐓ф姢浜�")
+    private String carePerson;
+
+    @ApiModelProperty("涓昏鐓ф姢浜哄勾榫�")
+    @Excel(name = "涓昏鐓ф姢浜哄勾榫�")
+    private String casePersonAge;
+
 }

--
Gitblit v1.9.3