From 28179175bedad0d867f111e7d9f34e4a4b9c9371 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 七月 2026 19:05:13 +0800
Subject: [PATCH] （1）同德短信问题处理 （2）同德过滤患者查询问题处理 （3）南华出院随访导出新增（年龄、病历号、性别）
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java | 103 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 76 insertions(+), 27 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
index c9bd59f..7123091 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
@@ -21,11 +21,11 @@
private static final long serialVersionUID = 1L;
/**
- * 浠诲姟鍚嶇О
+ * 绉戝鍚嶇О
*/
- @Excel(name = "浠诲姟鍚嶇О")
- @ApiModelProperty(value = "浠诲姟鍚嶇О")
- private String taskName;
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
/**
* 鍙戦�佷汉
@@ -35,19 +35,38 @@
private String sendname;
/**
- * 鍙戦�佺姸鎬�
+ * 骞撮緞
*/
- @Excel(name = " 浠诲姟鐘舵�� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
- private Long sendstate;
+ @Excel(name = "骞撮緞 ")
+ @ApiModelProperty(value = "骞撮緞")
+ private Long age;
/**
- * 瀹屾垚鏃堕棿
+ * 鎬у埆
*/
- @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "瀹屾垚鏃堕棿")
- private Date finishtime;
+ @ApiModelProperty(value = "鎬у埆")
+ private Long sex;
+
+ /**
+ * 鎬у埆
+ */
+ @Excel(name = "鎬у埆")
+ @ApiModelProperty(value = "鎬у埆")
+ private String sexName;
+
+ /**
+ * 灏辫瘖缂栧彿锛堝搴旂殑outhospno銆乮nhospno锛�
+ */
+// @Excel(name = "灏辫瘖缂栧彿")
+ @ApiModelProperty(value = "灏辫瘖缂栧彿锛堝搴旂殑outhospno銆乮nhospno锛�")
+ private String hospno;
+
+ /**
+ * 鐥呭巻鍙�
+ */
+ @Excel(name = "鐥呭巻鍙�")
+ @ApiModelProperty(value = "鎮ｈ�呯紪鍙凤紙鐥呭巻鍙凤級")
+ private String patno;
/**
* 鍑洪櫌鏃堕棿
@@ -64,6 +83,19 @@
@ApiModelProperty(value = "搴旈殢璁挎棩鏈�")
private Date visitTime;
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+ private Date finishtime;
+
+ /**
+ * 闅忚浜哄憳
+ */
+ @Excel(name = "闅忚浜哄憳")
+ private String updateBy;
/**
* 鍖荤敓濮撳悕
@@ -72,15 +104,32 @@
@ApiModelProperty(value = "鍖荤敓濮撳悕")
private String drname;
- /**
- * 闅忚浜哄憳
- */
- @Excel(name = "闅忚浜哄憳")
- private String updateBy;
-
@Excel(name = "鍑洪櫌澶╂暟", suffix = "澶�")
@ApiModelProperty(value = "鍑洪櫌澶╂暟")
private Integer endDay;
+
+ /**
+ * 鍑洪櫌璇婃柇
+ */
+ @Excel(name = " 鍑洪櫌璇婃柇 ")
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇")
+ private String leavediagname;
+
+
+ /**
+ * 鍙戦�佺姸鎬�
+ */
+// @Excel(name = " 浠诲姟鐘舵�� ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
+ private Long sendstate;
+
+ /**
+ * 鍙戦�佺姸鎬�
+ */
+ @Excel(name = " 浠诲姟鐘舵�� ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
+ private String stName;
+
/**
* 韬唤璇佸彿
@@ -106,14 +155,6 @@
/**
- * 绉戝鍚嶇О
- */
- @Excel(name = "绉戝鍚嶇О")
- @ApiModelProperty(value = "绉戝鍚嶇О")
- private String deptname;
-
-
- /**
* 鍑洪櫌鐥呭尯鍚嶇О
*/
@ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
@@ -136,10 +177,18 @@
@Excel(name = "浠诲姟鎵ц鏂瑰紡")
private String preachform;
+ /**
+ * 浠诲姟鍚嶇О
+ */
+ @Excel(name = "浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ private String taskName;
+
/**
* 澶囨敞
*/
+ @Excel(name = "澶囨敞")
@ApiModelProperty(value = "澶囨敞")
private String remark;
--
Gitblit v1.9.3