From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index feb1aa4..905ee0d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -17,10 +17,7 @@
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -179,14 +176,14 @@
private Date loginDate;
/**
- * 闄㈠尯淇℃伅
- */
- @ApiModelProperty(value = "闄㈠尯淇℃伅")
- private String hospInfo;
- /**
* 绉戝淇℃伅
*/
@ApiModelProperty(value = "绉戝淇℃伅")
+ private String hospInfo;
+ /**
+ * 鐥呭尯淇℃伅
+ */
+ @ApiModelProperty(value = "鐥呭尯淇℃伅")
private String deptInfo;
/**
@@ -255,27 +252,37 @@
@ApiModelProperty("绉戝闆嗗悎")
private List<Map<String, Object>> belongDepts = new ArrayList();
-
- public String getCampusid() {
- return campusid;
- }
-
- public void setCampusid(String campusid) {
- this.campusid = campusid;
- }
+ /**
+ * 婊℃剰搴﹀垎绫�
+ */
+ @ApiModelProperty("婊℃剰搴﹀垎绫伙紙闂嵎/璇煶锛�")
+ private Map<String, Object> satisfactionCategories = new HashMap<>();
/**
- * 鏈烘瀯ID
+ * HIS澧為噺鍚屾寮�濮嬫椂闂达紙瀵瑰簲 healthy_user.last_Update_Time锛�
*/
- @ApiModelProperty("闄㈠尯")
- @Excel(name = " 闄㈠尯 ")
- private String campusid;
+ @ApiModelProperty("鍚屾寮�濮嬫椂闂达紝鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private String lastStartTime;
+
+ /**
+ * HIS澧為噺鍚屾缁撴潫鏃堕棿锛堝搴� healthy_user.last_Update_Time锛�
+ */
+ @ApiModelProperty("鍚屾缁撴潫鏃堕棿锛屾牸寮忥細yyyy-MM-dd HH:mm:ss")
+ private String lastEndTime;
public SysUser() {
}
+ public Map<String, Object> getSatisfactionCategories() {
+ return satisfactionCategories;
+ }
+
+ public void setSatisfactionCategories(Map<String, Object> satisfactionCategories) {
+ this.satisfactionCategories = satisfactionCategories;
+ }
+
public List<Map<String, Object>> getBelongWards() {
return this.belongWards;
}
--
Gitblit v1.9.3