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/PatArchiveReq.java | 98 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
index 82bf80d..47f2bd0 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
@@ -18,9 +18,9 @@
* @author ls
* @date 2023-06-14
*/
-@ApiModel(value = "PatArchiveReq" , description = "鎮ｈ�呮。妗堣姹傚璞�")
+@ApiModel(value = "PatArchiveReq", description = "鎮ｈ�呮。妗堣姹傚璞�")
@Data
-public class PatArchiveReq {
+public class PatArchiveReq extends BaseEntity {
/**
* 濮撳悕
*/
@@ -45,8 +45,11 @@
/**
* 鐤剧梾鍚嶇О
*/
+ @ApiModelProperty("绂婚櫌鐤剧梾鍚嶇О")
+ @Excel(name = " 绂婚櫌鐤剧梾鍚嶇О ")
+ private String leavediagname;
+
@ApiModelProperty("鐤剧梾鍚嶇О")
- @Excel(name = " 鐤剧梾鍚嶇О ")
private String diagname;
@@ -56,6 +59,27 @@
@ApiModelProperty("鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�")
@Excel(name = " 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕� ")
private String notrequiredFlag;
+
+ /**
+ * 涓嶈鏈嶅姟鐨勫師鍥�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勫師鍥�")
+ @Excel(name = " 涓嶈鏈嶅姟鐨勫師鍥� ")
+ private String notrequiredreason;
+
+
+ /**
+ * 涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�")
+ private String filterDrname;
+
+
+ /**
+ * 涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勬搷浣滃尰鐢熺紪鐮�")
+ private String filterDrcode;
/**
@@ -74,10 +98,10 @@
private String telcode;
/**
- * 鎵嬫満鍙风爜
+ * 绂婚櫌鐤剧梾缂栫爜
*/
- @ApiModelProperty("鎵嬫満鍙风爜")
- @Excel(name = " 鎵嬫満鍙风爜 ")
+ @ApiModelProperty("绂婚櫌鐤剧梾缂栫爜")
+ @Excel(name = " 绂婚櫌鐤剧梾缂栫爜 ")
private String leaveicd10code;
/**
@@ -88,9 +112,9 @@
/**
- * 鏌ョ湅鍏ㄩ儴 0 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ * 鏌ョ湅鍏ㄩ儴 0 鏌ョ湅鍑洪櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3 鏌ョ湅鍦ㄩ櫌 4
*/
- @ApiModelProperty(value = " 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3")
+ @ApiModelProperty(value = " 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3 鏌ョ湅鍑洪櫌 4")
private Long allhosp;
@@ -111,6 +135,12 @@
*/
@ApiModelProperty(value = "鍖荤敓")
private String drname;
+
+ /**
+ * 鍖婚櫌缂栫爜
+ */
+ @ApiModelProperty(value = "鍖婚櫌缂栫爜")
+ private String drcode;
/**
@@ -134,16 +164,16 @@
/**
* pageNum
*/
- @ApiModelProperty(value = "pageNum")
- @Excel(name = "pageNum")
- private Integer pageNum;
+ @ApiModelProperty(value = "pn")
+ @Excel(name = "pn")
+ private Integer pn;
/**
* pageSize
*/
- @ApiModelProperty(value = "pageSize")
- @Excel(name = "pageSize")
- private Integer pageSize;
+ @ApiModelProperty(value = "ps")
+ @Excel(name = "ps")
+ private Integer ps;
/**
@@ -169,13 +199,49 @@
/**
* 鐥呭尯缂栧彿
*/
- @ApiModelProperty(value = "鐥呭尯缂栧彿")
+ @ApiModelProperty(value = "绂婚櫌鐥呭尯缂栧彿")
private List<String> leavehospitaldistrictcodes;
+
+ /**
+ * 绉戝缂栫爜
+ */
+ @ApiModelProperty(value = "绂婚櫌绉戝缂栫爜")
+ private List<String> leaveldeptcodes;
+ /**
+ * 鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鐥呭尯缂栧彿")
+ private List<String> hospitaldistrictcodes;
/**
* 绉戝缂栫爜
*/
@ApiModelProperty(value = "绉戝缂栫爜")
@Excel(name = " 绉戝缂栫爜 ")
- private List<String> leaveldeptcodes;
+ private List<String> deptcodes;
+
+ /**
+ * 鍑哄叆闄㈡爣璇�
+ */
+ @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌 1鍑洪櫌 ")
+ private Integer cry;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTimeStart;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTimeEnd;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty("闄㈠尯")
+ @Excel(name = " 闄㈠尯 ")
+ private String campusid;
}
--
Gitblit v1.9.3