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/PatMedOperationItem.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
index 6fd3835..9c419c1 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 鎮ｈ�呮鏌ユ楠岃褰曞瓙瀵硅薄 pat_med_operation_item
@@ -216,5 +217,55 @@
@ApiModelProperty("鎶ゅ＋濮撳悕")
@Excel(name = "鎶ゅ＋濮撳悕")
private String nurseName;
+
+ @ApiModelProperty(value = "鐥呭尯缂栫爜闆嗗悎")
+ private List<String> wardCodes;
+
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜闆嗗悎")
+ private List<String> deptCodes;
+
+ @ApiModelProperty(value = "鎵嬫湳绛夌骇闆嗗悎")
+ private List<String> opLevelCodes;
+
+ /**
+ * 鍑洪櫌绉戝缂栫爜
+ */
+ @ApiModelProperty(value = "鍑洪櫌绉戝缂栫爜")
+ private String leaveldeptcode;
+
+ /**
+ * 鍑洪櫌绉戝鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
+ private String leaveldeptname;
+
+ /**
+ * 鍑洪櫌鐥呭尯缂栫爜
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栫爜")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ private String leavehospitaldistrictname;
+
+ /**
+ * 浣忛櫌鏍囪瘑锛�0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉� 3寰呭叆闄�
+ */
+ @ApiModelProperty(value = "浣忛櫌鏍囪瘑锛� 0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉� 3寰呭叆闄�")
+ private String inhospstate;
+
+ /**
+ * 浣忛櫌璁板綍娴佹按鍙�
+ */
+ @ApiModelProperty("浣忛櫌璁板綍娴佹按鍙�")
+ @Excel(name = "浣忛櫌璁板綍娴佹按鍙�")
+ private String serialnum;
+
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private String inhospEndtime;
+
}
--
Gitblit v1.9.3