From fd12c3a4d5c0a247c89ab59faba189075a302ffd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 09 六月 2025 18:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 13 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index 66363b8..4c6ff11 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -16,41 +16,37 @@
public class ServiceSubtaskStatistic {
private static final long serialVersionUID = 1L;
- /**
- * 鍑洪櫌鐥呭尯缂栧彿
- */
- @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
- private String leavehospitaldistrictcode;
-
- /**
- * 鍑洪櫌鐥呭尯鍚嶇О
- */
- @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
- @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
- private String leavehospitaldistrictname;
-
@ApiModelProperty(value = "鏈嶅姟鎬婚噺")
+ @Excel(name = " 鏈嶅姟鎬婚噺 ")
private Integer serviceCount = 0;
@ApiModelProperty(value = "鎮ｈ�呰繃婊ら噺锛堜笉鎵ц鏁伴噺锛�")
+ @Excel(name = " 鎮ｈ�呰繃婊ら噺 ")
private Long bzxCount = 0L;
@ApiModelProperty(value = "搴旈殢璁块噺")
+ @Excel(name = " 搴旈殢璁块噺 ")
private Long ysfCount = 0L;
@ApiModelProperty(value = "鍙戦�佸け璐ヨ閲�")
+ @Excel(name = " 鍙戦�佸け璐� ")
private Long fssbCount = 0L;
@ApiModelProperty(value = "寰呭彂閫佹暟閲�")
+ @Excel(name = " 寰呭彂閫� ")
private Long dfsCount = 0L;
@ApiModelProperty(value = "宸插彂閫佹暟閲�")
+ @Excel(name = " 宸插彂閫� ")
private Long yfsCount = 0L;
+
@ApiModelProperty(value = "宸插畬鎴愭暟閲�")
+ @Excel(name = " 宸插畬鎴� ")
private Long ywcCount = 0L;
@ApiModelProperty(value = "闅忚瀹屾垚鐜�")
+ @Excel(name = " 闅忚瀹屾垚鐜� ")
private String sfwcl;
@ApiModelProperty(value = "鐭俊鍙戦�佹鏁�")
@@ -72,9 +68,78 @@
private Long dhsfwcl = 0L;
@ApiModelProperty(value = "寮傚父鎬绘暟")
+ @Excel(name = " 寮傚父鎬绘暟 ")
private Long yczs = 0L;
@ApiModelProperty(value = "鍥炲寮傚父鏁�")
+ @Excel(name = " 鍥炲寮傚父鏁� ")
private Long hfycs = 0L;
+ /**
+ * 06-04鏂扮粺璁￠〉闈㈠瓧娈�
+ */
+
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
+
+ @ApiModelProperty(value = "鍑洪櫌绉戝缂栧彿")
+ private String deptcode;
+
+ @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String deptname;
+
+ @ApiModelProperty(value = "鍑洪櫌浜烘")
+ @Excel(name = " 鍑洪櫌浜烘 ")
+ private Integer dischargeCount = 0;
+
+ @ApiModelProperty(value = "鏃犻渶闅忚浜烘")
+ @Excel(name = " 鏃犻渶闅忚浜烘 ")
+ private Long nonFollowUp = 0L;
+
+ @ApiModelProperty(value = "搴旈殢璁夸汉娆�")
+ @Excel(name = " 搴旈殢璁夸汉娆� ")
+ private Long followUpNeeded = 0L;
+
+ @ApiModelProperty(value = "棣栨搴旈殢璁�")
+ private Long needFollowUp = 0L;
+ @ApiModelProperty(value = "棣栨寰呴殢璁�")
+ private Long pendingFollowUp = 0L;
+ @ApiModelProperty(value = "棣栨闅忚鎴愬姛")
+ private Long followUpSuccess = 0L;
+ @ApiModelProperty(value = "棣栨闅忚澶辫触")
+ private Long followUpFail = 0L;
+ @ApiModelProperty(value = "棣栨闅忚鐜�")
+ private String followUpRate;
+ @ApiModelProperty(value = "棣栨浜哄伐")
+ private Long manual = 0L;
+ @ApiModelProperty(value = "棣栨鐭俊")
+ private Long sms = 0L;
+ @ApiModelProperty(value = "棣栨寰俊")
+ private Long weChat = 0L;
+ @ApiModelProperty(value = "缁撴灉寮傚父")
+ private Long abnormal = 0L;
+
+ @ApiModelProperty(value = "浜屾搴旈殢璁�")
+ private Long needFollowUpAgain = 0L;
+ @ApiModelProperty(value = "浜屾寰呴殢璁�")
+ private Long pendingFollowUpAgain = 0L;
+ @ApiModelProperty(value = "浜屾闅忚鎴愬姛")
+ private Long followUpSuccessAgain = 0L;
+ @ApiModelProperty(value = "浜屾闅忚澶辫触")
+ private Long followUpFailAgain = 0L;
+ @ApiModelProperty(value = "浜屾闅忚鐜�")
+ private String followUpRateAgain;
+ @ApiModelProperty(value = "浜屾浜哄伐")
+ private Long manualAgain = 0L;
+ @ApiModelProperty(value = "浜屾鐭俊")
+ private Long smsAgain = 0L;
+ @ApiModelProperty(value = "浜屾寰俊")
+ private Long weChatAgain = 0L;
+ @ApiModelProperty(value = "缁撴灉寮傚父")
+ private Long abnormalAgain = 0L;
}
--
Gitblit v1.9.3