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/XinHuaWXReq.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java b/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
index 2e853db..fab95b7 100644
--- a/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
+++ b/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
@@ -16,27 +16,11 @@
public class XinHuaWXReq {
private static final long serialVersionUID = 1L;
-// /**
-// * 鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�
-// */
-// @ApiModelProperty(value = "鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�")
-// private String service = "smarthos.yygh.ApiService.push";
-//
-// private String spid = "1001";
-
/**
- * 璇佷欢鍙�
+ * 鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�
*/
- @Excel(name = " 璇佷欢鍙�")
- @ApiModelProperty(value = "璇佷欢鍙�")
- private String idcard;
-
- /**
- * 璇︽儏鍦板潃
- */
- @Excel(name = "閾炬帴鍦板潃")
- @ApiModelProperty(value = "閾炬帴鍦板潃")
- private String url;
+ @ApiModelProperty(value = "鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�")
+ private String service = "smarthos.pat.notice";
/**
@@ -44,6 +28,7 @@
*/
@ApiModelProperty(value = "搴旂敤缂栧彿")
private String appid;
+
/**
* 鎮ｈ�呯紪鍙�
@@ -56,6 +41,12 @@
*/
@ApiModelProperty(value = "鎮ｈ�呭鍚�")
private String patientname;
+ /**
+ * 璇佷欢鍙�
+ */
+ @Excel(name = " 璇佷欢鍙�")
+ @ApiModelProperty(value = "璇佷欢鍙�")
+ private String idcard;
/**
* 鎵嬫満鍙风爜
@@ -81,4 +72,16 @@
@ApiModelProperty(value = "閾炬帴鍦板潃")
private String content;
+ /**
+ * 璇︽儏鍦板潃
+ */
+ @Excel(name = "閾炬帴鍦板潃")
+ @ApiModelProperty(value = "閾炬帴鍦板潃")
+ private String url;
+
+
+
+
+
+
}
--
Gitblit v1.9.3