From 92fc422df30b34dce86e7231ca887c8fc0890c29 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 12 十二月 2025 15:11:08 +0800
Subject: [PATCH] 【丽水修复】历史随访记录导出修复
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java
index ea0b470..7dbc7b7 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java
@@ -19,37 +19,82 @@
public class ServiceSubtaskDiagname implements Serializable {
private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "鏈嶅姟鍚嶇О")
+ @Excel(name = "浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "浠诲姟鍚嶇О")
private String taskName;
- @ApiModelProperty(value = "鎮ｈ�呭鍚�")
- private String sendname;
-
- @ApiModelProperty(value = "鐢佃瘽")
- private String phone;
-
- @ApiModelProperty(value = "鎬у埆")
- private String sex;
-
-
- @ApiModelProperty(value = "鐤剧梾鍚嶇О")
- private String leavediagname;
-
- @ApiModelProperty(value = "闅忚鐘舵��")
+ // @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
+ @Excel(name = "浠诲姟鐘舵��", readConverterExp = "1=琚鍙�,2=寰呭彂閫�,3=宸插彂閫�,4=涓嶆墽琛�,5=鍙戦�佸け璐�,6=宸插畬鎴�")
+ @ApiModelProperty(value = "浠诲姟鐘舵��")
private Long sendstate;
- @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
- private Date starttime;
+ @Excel(name = "濮撳悕")
+ @ApiModelProperty(value = "濮撳悕")
+ private String sendname;
- @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ @Excel(name = "璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
+ private String leavediagname;
+
+ @Excel(name = "澶勭悊鎰忚")
+ @ApiModelProperty(value = "澶勭悊鎰忚")
+ private String suggest;
+
+ @Excel(name = "闅忚浜哄憳")
+ @ApiModelProperty(value = "闅忚浜哄憳")
+ private String operator;
+
+ @Excel(name = "闅忚瀹屾垚鏃ユ湡",dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "闅忚瀹屾垚鏃ユ湡")
+ private Date finishtime;
+
+ @Excel(name = "搴旈殢璁挎棩鏈�",dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "搴旈殢璁挎棩鏈�")
+ private Date longSendTime;
+
+ @Excel(name = "鍑洪櫌鏃ユ湡",dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍑洪櫌鏃ユ湡")
private Date endtime;
- @ApiModelProperty(value = "闅忚鏃堕棿")
- private Date visitTime;
+ @Excel(name = "鍑洪櫌澶╂暟", suffix = "澶�")
+ @ApiModelProperty(value = "鍑洪櫌澶╂暟")
+ private Integer endDay;
- @ApiModelProperty(value = "鎶ゅ＋濮撳悕")
+ @Excel(name = "韬唤璇佸彿鐮�")
+ @ApiModelProperty(value = "韬唤璇佸彿鐮�")
+ private String sfzh;
+
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ @Excel(name = "璐ｄ换鎶ゅ＋")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋")
private String nurseName;
+ @Excel(name = "涓绘不鍖荤敓")
+ @ApiModelProperty("涓绘不鍖荤敓")
+ private String drname;
+
+ @Excel(name = "绉戝")
+ @ApiModelProperty(value = "绉戝")
+ private String deptname;
+
+ @Excel(name = "鐥呭尯")
+ @ApiModelProperty(value = "鐥呭尯")
+ private String leavehospitaldistrictname;
+
+ @Excel(name = "鍑洪櫌闅忚妯℃澘鍚嶇О")
+ @ApiModelProperty(value = "鍑洪櫌闅忚妯℃澘鍚嶇О")
+ private String templatename;
+
+ @Excel(name = "浠诲姟鎵ц鏂瑰紡", readConverterExp = "1=浜哄伐,2=绾歌川,3=鐢佃瘽,4=鐭俊,5=寰俊鍏紬鍙�,6=寰俊灏忕▼搴�,7=鏀粯瀹�,8=鏅鸿兘灏忕▼搴�,9=閽夐拤")
+ @ApiModelProperty(value = "浠诲姟鎵ц鏂瑰紡")
+ private String preachform;
+
+ @Excel(name = "浠诲姟缁撴灉璇存槑", readConverterExp = "0=鍏佽,1=绂佹")
+ @ApiModelProperty(value = "浠诲姟缁撴灉璇存槑")
+ private String result;
+
}
--
Gitblit v1.9.3