From dbbb114c25b2406b6d1fd52019d2f2228ffcacd0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十一月 2024 18:04:16 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
index 5f00203..571c1f7 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;
/**
* 骞撮緞
@@ -96,6 +139,13 @@
private String deptName;
/**
+ * 绉戝缂栫爜
+ */
+ @Excel(name = "绉戝缂栫爜")
+ @ApiModelProperty("绉戝缂栫爜")
+ private String deptCode;
+
+ /**
* 绉戝
*/
@Excel(name = "鍦板潃")
@@ -117,6 +167,13 @@
private String phone;
/**
+ * 鎵嬫満鍙�
+ */
+ @Excel(name = "鎵嬫満code")
+ @ApiModelProperty("鎵嬫満code")
+ private String telcode;
+
+ /**
* 鐥呭巻鍙�
*/
@Excel(name = "鐥呭巻鍙�")
@@ -124,17 +181,18 @@
private String medicalRecordNo;
/**
- * 鐥呭巻鍙�
+ * 鍙戦�佺姸鎬�:1鎴愬姛 2 澶辫触 3鏆傚仠
*/
- @Excel(name = "鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
- @ApiModelProperty("鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
- private Long sendState;
+ @Excel(name = "鍙戦�佺姸鎬�:1鎴愬姛 2 澶辫触 3鏆傚仠")
+ @ApiModelProperty("鍙戦�佺姸鎬�:1鎴愬姛 2 澶辫触 3鏆傚仠")
+ private Long sendStatus;
/**
* 鍙戦�佹椂闂�
*/
@Excel(name = "鍙戦�佹椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍙戦�佹椂闂�")
private Date sendTime;
@@ -142,6 +200,7 @@
* 鍏ラ櫌鏃堕棿
*/
@Excel(name = "鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍏ラ櫌鏃堕棿")
private Date inhosptime;
@@ -149,6 +208,7 @@
* 鍙戦�佹椂闂�
*/
@Excel(name = "灏辫瘖鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("灏辫瘖鏃堕棿")
private Date visitTime;
@@ -202,4 +262,47 @@
@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;
+
+ /**
+ * 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿
+ */
+ @Excel(name = " 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
+ @ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
+ private Date longSendTime;
}
--
Gitblit v1.9.3