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/ExternalInHospPatientInfo.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java b/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
index cc4dacc..154ff2b 100644
--- a/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
@@ -163,7 +163,37 @@
     @ApiModelProperty(value = "浜у鏍囧織")
     private String ChanFuBZ;
 
+    @ApiModelProperty(value = "鐜颁綇鍧�淇℃伅")
+    private String XianZhuZXX;
+
+
+    @ApiModelProperty(value = "璐d换鎶ゅ+ID")
+    private String ZeRenHSID;
+
+    @ApiModelProperty(value = "璐d换鎶ゅ+濮撳悕")
+    private String ZeRenHSXM;
+
+    @ApiModelProperty(value = "涓绘不鍖荤敓ID")
+    private String ZhuZhiYSID;
+
+    @ApiModelProperty(value = "涓绘不鍖荤敓濮撳悕")
+    private String ZhuZhiYSXM;
+
     @ApiModelProperty(value = "鑱旂郴浜轰俊鎭�")
     List<ExternalInHospPatientLiaisonInfo> externalInHospPatientLiaisonInfos;
 
+    @ApiModelProperty(value = "缁忕鍖荤敓ID")
+    private String JingGuanYSID;
+
+    @ApiModelProperty(value = "缁忕鍖荤敓濮撳悕")
+    private String JingGuanYSXM;
+
+    @ApiModelProperty(value = "鐭彿淇℃伅")
+    private String DuanHaoXX;
+
+    @ApiModelProperty(value = "鐥呬汉绫诲瀷浠g爜")
+    private String BingRenLXDM;
+
+    @ApiModelProperty(value = "鐥呬汉绫诲瀷鍚嶇О")
+    private String BingRenLXMC;
 }

--
Gitblit v1.9.3