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 | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 8 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
index e60f263..06a8c93 100644
--- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
+++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
@@ -1,12 +1,11 @@
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;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
@@ -36,6 +35,13 @@
private Long patid;
/**
+ * 寰俊鍏紬鍙锋偅鑰匢D
+ */
+ @Excel(name = "寰俊鍏紬鍙锋偅鑰匢D")
+ @ApiModelProperty("寰俊鍏紬鍙锋偅鑰匢D")
+ private String openid;
+
+ /**
* 瀹ｆ暀浠诲姟ID
*/
@Excel(name = "瀹ｆ暀浠诲姟ID")
@@ -56,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;
/**
* 骞撮緞
@@ -91,6 +139,13 @@
private String deptName;
/**
+ * 绉戝缂栫爜
+ */
+ @Excel(name = "绉戝缂栫爜")
+ @ApiModelProperty("绉戝缂栫爜")
+ private String deptCode;
+
+ /**
* 绉戝
*/
@Excel(name = "鍦板潃")
@@ -119,17 +174,18 @@
private String medicalRecordNo;
/**
- * 鐥呭巻鍙�
+ * 鍙戦�佺姸鎬�:1鎴愬姛 2 澶辫触 3鏆傚仠
*/
- @Excel(name = "鍙戦�佺姸鎬�")
- @ApiModelProperty("鍙戦�佺姸鎬�")
- private Integer sendStatus;
+ @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;
@@ -137,6 +193,7 @@
* 鍏ラ櫌鏃堕棿
*/
@Excel(name = "鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍏ラ櫌鏃堕棿")
private Date inhosptime;
@@ -144,6 +201,7 @@
* 鍙戦�佹椂闂�
*/
@Excel(name = "灏辫瘖鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("灏辫瘖鏃堕棿")
private Date visitTime;
@@ -154,6 +212,13 @@
@Excel(name = "鎿嶄綔浜�")
@ApiModelProperty("鎿嶄綔浜�")
private String operatePerson;
+
+ /**
+ * 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�
+ */
+ @Excel(name = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
+ @ApiModelProperty("灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
+ private String hospType;
/**
@@ -190,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