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/DTO/PatMedInhospDTO.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java b/smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java
index 3277e05..294df40 100644
--- a/smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java
+++ b/smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java
@@ -540,4 +540,26 @@
@ApiModelProperty("'婊℃剰搴︽爣璇嗭細0鏈仛婊″害 1浣忛櫌婊″害搴� 2鍑洪櫌婊℃剰搴� 锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�")
@Excel(name = " '婊℃剰搴︽爣璇嗭細0鏈仛婊″害 1浣忛櫌婊″害搴� 2鍑洪櫌婊℃剰搴� 锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛� ")
private String inhospMydFlag;
+
+ /**
+ * 鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊
+ */
+ @ApiModelProperty("鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊")
+ @Excel(name = "鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊")
+ private String medicalCode;
+
+ /**
+ * 鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊
+ */
+ @ApiModelProperty("鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊")
+ @Excel(name = "鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊")
+ private String medicalName;
+
+ /**
+ * 鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊
+ */
+ @ApiModelProperty("鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊")
+ @Excel(name = "鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊")
+ private String medicalCompany;
+
}
--
Gitblit v1.9.3