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/ServiceTaskScriptQues.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskScriptQues.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskScriptQues.java
index bc949ff..ec8d820 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskScriptQues.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskScriptQues.java
@@ -22,17 +22,47 @@
private String param1;
/**
- * patid
+ * patid 鎴� 娴佹按鍙�
+ * 璇婄枟璁板綍鍙�
*/
- @Excel(name = "patid ")
- @ApiModelProperty(value = "patid")
+ @Excel(name = "patid 鎴� 浣忛櫌娴佹按鍙� ")
+ @ApiModelProperty(value = "patid 鎴� 浣忛櫌娴佹按鍙�")
private String param2;
/**
- * patfrom
+ * patid 鎴� 娴佹按鍙�
+ * 璇婄枟璁板綍鍙�
+ */
+ @Excel(name = "闂ㄨ瘖娴佹按鍙� ")
+ @ApiModelProperty(value = "闂ㄨ瘖娴佹按鍙�")
+ private String param3;
+
+ /**
+ * 鎶曡瘔鎮ｈ�呯紪鍙�
+ * 鎶曡瘔鎮ｈ�呯紪鍙�
+ */
+ @Excel(name = "鎶曡瘔鎮ｈ�呯紪鍙� patientId ")
+ @ApiModelProperty(value = "鎶曡瘔鎮ｈ�呯紪鍙� patientId")
+ private String param4;
+
+ /**
+ * 瀛愪换鍔D subId
+ */
+ @Excel(name = "瀛愪换鍔D subId ")
+ @ApiModelProperty(value = "瀛愪换鍔D subId")
+ private String param6;
+
+ /**
+ * 鎮ｈ�呮潵婧�
*/
@Excel(name = "patfrom ")
@ApiModelProperty(value = "patfrom")
private String patfrom = "0";
+ /**
+ * 绫诲瀷锛�0鍔犲瘑 1涓嶅姞瀵�
+ */
+ @ApiModelProperty(value = "绫诲瀷锛�0鍔犲瘑 1涓嶅姞瀵�")
+ private String type = "0";
+
}
--
Gitblit v1.9.3