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/Icd10.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/Icd10.java b/smartor/src/main/java/com/smartor/domain/Icd10.java
index faf983c..5ec91fc 100644
--- a/smartor/src/main/java/com/smartor/domain/Icd10.java
+++ b/smartor/src/main/java/com/smartor/domain/Icd10.java
@@ -8,6 +8,8 @@
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.List;
+
/**
* 鐤剧梾瀵硅薄 icd10
*
@@ -31,6 +33,13 @@
@ApiModelProperty("icd10缂栫爜")
@Excel(name = "icd10缂栫爜")
private String icdcode;
+
+ /**
+ * HIS鐨刬cd10id
+ */
+ @ApiModelProperty("HIS鐨刬cd10id")
+ @Excel(name = "HIS鐨刬cd10id")
+ private String hisIcdid;
/**
* icd10鍚嶇О
@@ -92,5 +101,22 @@
@ApiModelProperty("pageSize")
private Integer pageSize;
+ /**
+ * 鏈骇鏍囧織
+ */
+ @ApiModelProperty("lastflag")
+ private String lastflag;
+ /**
+ * 涓尰鏍囧織
+ */
+ @ApiModelProperty("chimedflag")
+ private String chimedflag;
+
+ /**
+ * icd10缂栫爜
+ */
+ @ApiModelProperty("icd10缂栫爜闆嗗悎")
+ @Excel(name = "icd10缂栫爜闆嗗悎")
+ private List<String> icdcodes;
}
--
Gitblit v1.9.3