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)
---
smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
index 4683837..13e29c5 100644
--- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
+++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
@@ -1,5 +1,6 @@
package com.smartor.domain;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -143,7 +144,7 @@
*/
@Excel(name = "绉戝缂栫爜")
@ApiModelProperty("绉戝缂栫爜")
- private String deptCode;
+ private String deptcode;
/**
* 绉戝
@@ -217,7 +218,7 @@
@Excel(name = "鍙戦�佹椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍙戦�佹椂闂�")
- private Date visitTime;
+ private Date visittime;
/**
@@ -233,6 +234,13 @@
@Excel(name = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
@ApiModelProperty("灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
private String hospType;
+
+ /**
+ * 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�
+ */
+ @Excel(name = "灏辫瘖id锛�1闂ㄨ瘖 2鍑洪櫌锛�")
+ @ApiModelProperty("灏辫瘖id锛�1闂ㄨ瘖 2鍑洪櫌锛�")
+ private Long hospid;
/**
@@ -312,4 +320,22 @@
@Excel(name = " 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
@ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
private Date longSendTime;
+
+
+ @ApiModelProperty(value = "缁х画鏍囪瘑")
+ private Integer continueFlag;
+
+ @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date continueTimeNow;
+
+ @ApiModelProperty(value = "缁х画鍐呭")
+ private JSONObject continueContent;
+
+ @ApiModelProperty(value = "缁х画娆℃暟")
+ private Integer continueCount;
+
+ @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date continueTimeNext;
}
--
Gitblit v1.9.3