From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
index 6a5d515..06a8c93 100644
--- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
+++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
@@ -1,5 +1,6 @@
 package com.smartor.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -61,11 +62,53 @@
     private String name;
 
     /**
+     * 濮撳悕
+     */
+    @Excel(name = "鍖荤敓缂栫爜")
+    @ApiModelProperty("鍖荤敓缂栫爜")
+    private String drcode;
+
+    /**
+     * 濮撳悕
+     */
+    @Excel(name = "鍖荤敓濮撳悕")
+    @ApiModelProperty("鍖荤敓濮撳悕")
+    private String drname;
+
+    /**
+     * 璐ｄ换鎶ゅ＋缂栫爜
+     */
+    @Excel(name = "璐ｄ换鎶ゅ＋缂栫爜")
+    @ApiModelProperty("璐ｄ换鎶ゅ＋缂栫爜")
+    private String nurseId;
+
+    /**
+     * 璐ｄ换鎶ゅ＋濮撳悕
+     */
+    @Excel(name = "璐ｄ换鎶ゅ＋濮撳悕")
+    @ApiModelProperty("璐ｄ换鎶ゅ＋濮撳悕")
+    private String nurseName;
+
+
+    /**
      * 韬唤璇佸彿
      */
     @Excel(name = "韬唤璇佸彿")
     @ApiModelProperty("韬唤璇佸彿")
     private String sfzh;
+
+    /**
+     * 韬唤璇佸彿
+     */
+    @Excel(name = "韬唤璇佸彿")
+    @ApiModelProperty("韬唤璇佸彿")
+    private String idcardno;
+    /**
+     * 韬唤璇佸彿
+     */
+    @Excel(name = "韬唤璇佸彿")
+    @ApiModelProperty("韬唤璇佸彿")
+    private String idcardtype;
 
     /**
      * 骞撮緞
@@ -142,6 +185,7 @@
      * 鍙戦�佹椂闂�
      */
     @Excel(name = "鍙戦�佹椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("鍙戦�佹椂闂�")
     private Date sendTime;
 
@@ -149,6 +193,7 @@
      * 鍏ラ櫌鏃堕棿
      */
     @Excel(name = "鍏ラ櫌鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("鍏ラ櫌鏃堕棿")
     private Date inhosptime;
 
@@ -156,6 +201,7 @@
      * 鍙戦�佹椂闂�
      */
     @Excel(name = "灏辫瘖鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("灏辫瘖鏃堕棿")
     private Date visitTime;
 
@@ -209,4 +255,41 @@
     @ApiModelProperty(value = "鏂囨湰鍙橀噺鍙傛暟")
     private String textParam;
 
+    /**
+     * 鍑洪櫌鐥呭尯缂栧彿
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+    private String leavehospitaldistrictcode;
+
+    /**
+     * 鍑洪櫌鐥呭尯鍚嶇О
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+    @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+    private String leavehospitaldistrictname;
+
+
+    /**
+     * 鍑洪櫌鏃堕棿
+     */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+    private Date endtime;
+
+    /**
+     * 鍏ラ櫌鏃堕棿
+     */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+    private Date starttime;
+
+    /**
+     * 瀹屾垚鏃堕棿
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+    private Date finishtime;
+
 }

--
Gitblit v1.9.3