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/ServiceTaskVO.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index 174128d..42e8e90 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -47,6 +47,13 @@
private Long sendDay;
/**
+ * 寤舵湡瀹屾垚澶╂暟锛堥殢璁夸换鍔″畬鎴愭椂鐢ㄤ簬鍒ゆ柇鏄惁瓒呮椂锛岀己鐪�0锛�
+ */
+ @Excel(name = "寤舵湡瀹屾垚澶╂暟")
+ @ApiModelProperty(value = "寤舵湡瀹屾垚澶╂暟")
+ private Long delayFinishDays;
+
+ /**
*
*/
@Excel(name = " ")
@@ -414,6 +421,27 @@
private String icd10name;
/**
+ * 鑽搧缂栫爜
+ */
+ @ApiModelProperty("鑽搧缂栫爜")
+ @Excel(name = "鑽搧缂栫爜")
+ private String medicalCode;
+
+ /**
+ * 鑽搧鍘傚
+ */
+ @ApiModelProperty("鑽搧鍘傚")
+ @Excel(name = "鑽搧鍘傚")
+ private String medicalCompany;
+
+ /**
+ * 鐤剧梾鍚嶇О
+ */
+ @ApiModelProperty("鑽搧鍚嶇О")
+ @Excel(name = "鑽搧鍚嶇О")
+ private String medicalName;
+
+ /**
* 鎵嬫湳缂栫爜
*/
@ApiModelProperty("鎵嬫湳缂栫爜")
@@ -434,10 +462,10 @@
@Excel(name = "鎵嬫湳绛夌骇缂栫爜")
private String oplevelcode;
/**
- * 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷
+ * 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁�
*/
- @ApiModelProperty("閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
- @Excel(name = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
+ @ApiModelProperty("閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁� 6.鎸夎嵂鍝佺紪鐮�")
+ @Excel(name = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁� 6.鎸夎嵂鍝佺紪鐮�" )
private String appltype;
@ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜")
@@ -452,4 +480,10 @@
@ApiModelProperty(value = "鐤剧梾鐥呯")
@Excel(name = " 鐤剧梾鐥呯")
private String diagType;
+
+ /**
+ * 浠诲姟缁勮鍒掞紙appltype=5 蹇呭～锛屼富璁″垝 + 鏄庣粏鍒楄〃锛�
+ */
+ @ApiModelProperty(value = "浠诲姟缁勮鍒掞紙appltype=5 蹇呭～锛屼富璁″垝+鏄庣粏锛�")
+ private ServiceTaskScheduleVO serviceTaskScheduleVO;
}
--
Gitblit v1.9.3