From 2d42d335a0abdabf02601b63b85dda82f5b0781b Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 02 十一月 2026 16:51:05 +0800
Subject: [PATCH] 【丽水】新增再次随访 回院复诊复查 统计
---
smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java b/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
index 0ff3281..78ee3ea 100644
--- a/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
+++ b/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
@@ -84,10 +84,10 @@
private String senduuid;
/**
- * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
+ * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID銆�6鍥為櫌澶嶈瘖澶嶆煡
*/
- @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
- @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
+ @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫銆�6鍥為櫌澶嶈瘖澶嶆煡 ")
+ @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫銆�6鍥為櫌澶嶈瘖澶嶆煡")
private String suggest;
/**
@@ -112,6 +112,18 @@
*/
@ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
private Integer rateDay;
+
+ /**
+ * 鏄惁鍗冲皢瓒呮椂锛�1 鏄紙閰嶅悎 soonTimeoutHours 浣跨敤锛�
+ */
+ @ApiModelProperty(value = "鏄惁鍗冲皢瓒呮椂:1鏄�")
+ private Integer soonTimeout;
+
+ /**
+ * 鍗冲皢瓒呮椂鏃堕棿锛堝皬鏃讹級锛氱粺璁¤窛瓒呮椂鎴鏃堕棿鍦� N 灏忔椂鍐呯殑寰呴殢璁挎暟閲�
+ */
+ @ApiModelProperty(value = "鍗冲皢瓒呮椂鏃堕棿(灏忔椂)")
+ private Integer soonTimeoutHours;
/**
* 鎬у埆
@@ -307,6 +319,19 @@
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
private Date finishtime;
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿(寮�濮嬫煡璇�)")
+ private Date finishtimeStart;
+
+ /**
+ * 瀹屾垚鏃堕棿(缁撴潫鏌ヨ)
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿(缁撴潫鏌ヨ)")
+ private Date finishtimeEnd;
/**
* 灏辫瘖璁板綍缂栧彿
@@ -462,6 +487,12 @@
@Excel(name = " 褰撳墠鍙戦�佹柟寮�")
@ApiModelProperty(value = "褰撳墠鍙戦�佹柟寮�")
private String currentPreachform;
+
+ /**
+ * 褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧
+ */
+ @ApiModelProperty(value = "褰撳墠鎵ц鏂瑰紡澶氶�夌瓫閫夛紝澶氫釜鍊肩敤閫楀彿鍒嗛殧")
+ private String currentPreachforms;
/**
@@ -632,6 +663,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
/**
* 鍑洪櫌鏃堕棿
@@ -761,6 +798,13 @@
@ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊;3宸插鐞�")
private Integer isabnormal;
+ /**
+ * 浜哄伐鐢佃瘽鏍囪
+ */
+ @Excel(name = " 浜哄伐鐢佃瘽鏍囪 ")
+ @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+ private Long isManuallyCalled;
+
@ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜闆嗗悎")
private List<String> visitDeptCodes;
@@ -805,4 +849,12 @@
@ApiModelProperty(value = "鎵嬫湳璁板綍id闆嗗悎")
private List<Long> operationItemIds;
+
+ /**
+ * 骞撮緞
+ */
+ @Excel(name = " 鍑洪櫌鐥呬汉璁板綍ID闆嗗悎")
+ @ApiModelProperty(value = "鍑洪櫌鐥呬汉璁板綍ID闆嗗悎")
+ private List<Long> inhospids;
+
}
--
Gitblit v1.9.3