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/PatMedOuthosp.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
index 0ed79a0..067b229 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 鎮ｈ�呴棬璇婅褰曞璞� pat_med_outhosp
@@ -32,7 +33,7 @@
@ApiModelProperty(value = "闂ㄨ瘖缂栧彿")
private String outhospno;
- @ApiModelProperty(value = "闀挎湡浠诲姟闅忚鏍囪瘑锛�0涓嶉渶瑕侊紝1闇�瑕�")
+ @ApiModelProperty(value = "闀挎湡浠诲姟闅忚鏍囪瘑锛�0闇�瑕侊紝1涓嶉渶瑕�")
private String fuflag;
/**
@@ -82,6 +83,12 @@
*/
@ApiModelProperty(value = "绉戝浠ｇ爜")
private String deptcode;
+
+ /**
+ * 绉戝浠ｇ爜
+ */
+ @ApiModelProperty(value = "绉戝浠ｇ爜闆嗗悎")
+ private List<String> deptcodes;
/**
* 绉戝鍚嶇О
@@ -161,7 +168,7 @@
private String hpi;
/**
- 鎮ｈ�呮。妗堢紪鍙� 鐜扮梾鍙�
+ * 鎮ｈ�呮。妗堢紪鍙� 鐜扮梾鍙�
*/
@ApiModelProperty(value = "鎮ｈ�呮。妗堢紪鍙�")
private String patno;
@@ -191,6 +198,12 @@
@ApiModelProperty(value = "骞撮緞")
private String age;
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty(value = "鎬у埆")
+ private Long sex;
+
/**
* 鎵嬫満鍙�
@@ -203,6 +216,12 @@
*/
@ApiModelProperty(value = "鐤剧梾闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
private String diagcheckFlag;
+
+ /**
+ * 閮ㄩ棬闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊
+ */
+ @ApiModelProperty(value = "閮ㄩ棬闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触 ")
+ private String deptcheckFlag;
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -235,4 +254,11 @@
@ApiModelProperty(value = "鏈�鍚庣粨鏉熸椂闂�")
private String lastEndTime;
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty("闄㈠尯")
+ @Excel(name = " 闄㈠尯 ")
+ private String campusid;
+
}
--
Gitblit v1.9.3