From 126d76bf7498be4f508bc66496e06ae217faee36 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 16:03:39 +0800
Subject: [PATCH] fix: suggest6改为suggest7，修正复查复诊统计口径
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java | 4 ++--
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index 4cac22b..3c840c3 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -322,9 +322,9 @@
@Excel(name = " 浜屾闅忚澶辫触 ")
private Long followUpFailAgain = 0L;
- @ApiModelProperty(value = "鍐嶆闅忚鍥為櫌澶嶈瘖澶嶆煡锛坰uggest=6锛�")
+ @ApiModelProperty(value = "鍐嶆闅忚鍥為櫌澶嶈瘖澶嶆煡锛坰uggest=7锛�")
@Excel(name = " 鍐嶆闅忚鍥為櫌澶嶈瘖澶嶆煡 ")
- private Long suggest6CountAgain = 0L;
+ private Long suggest7CountAgain = 0L;
@ApiModelProperty(value = "浜屾闅忚鐜�")
@Excel(name = " 浜屾闅忚鐜� ")
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 050b545..80b9b62 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -4148,7 +4148,7 @@
}
/**
- * 鍐嶆闅忚闄勫姞缁熻锛氬緟闅忚銆佸凡鍙戦�併�佷汉宸ョ數璇濊秴鏃跺強鍥為櫌澶嶈瘖澶嶆煡锛坰uggest=6锛夈��
+ * 鍐嶆闅忚闄勫姞缁熻锛氬緟闅忚銆佸凡鍙戦�併�佷汉宸ョ數璇濊秴鏃跺強鍥為櫌澶嶈瘖澶嶆煡锛坰uggest=7锛夈��
*/
private void applyAgainFollowUpExtraStatistics(ServiceSubtaskStatistic statistic, ServiceSubtask serviceSubtask) {
if (serviceSubtask.getVisitCount() == null || serviceSubtask.getVisitCount() <= 1) {
@@ -4158,9 +4158,9 @@
return;
}
Long sendstate = serviceSubtask.getSendstate();
- // 鍥為櫌澶嶈瘖澶嶆煡锛氬啀娆￠殢璁夸腑鎸夊鐞嗘剰瑙� suggest=6 缁熻
- if (StringUtils.equals("6", StringUtils.trim(serviceSubtask.getSuggest()))) {
- statistic.setSuggest6CountAgain(statistic.getSuggest6CountAgain() + 1L);
+ // 鍥為櫌澶嶈瘖澶嶆煡锛氬啀娆￠殢璁夸腑鎸夊鐞嗘剰瑙� suggest=7 缁熻
+ if (StringUtils.equals("7", StringUtils.trim(serviceSubtask.getSuggest()))) {
+ statistic.setSuggest7CountAgain(statistic.getSuggest7CountAgain() + 1L);
}
if (sendstate.equals(3L)) {
statistic.setSentAgain(statistic.getSentAgain() + 1L);
@@ -4967,7 +4967,7 @@
* pendingFollowUpSentAgainInfo - visitCount > 1 && sendstate in (3,7)
* sentInfo - visitCount = 1 && sendstate = 3
* sentAgainInfo - visitCount > 1 && sendstate = 3
- * suggest6CountAgainInfo - visitCount > 1 && suggest = 6
+ * suggest7CountAgainInfo - visitCount > 1 && suggest = 7
* filterCountList - taskSituation = 6 && sendstate = 4
*
*/
@@ -5152,10 +5152,10 @@
serviceSubtaskCountReq.setVisitCount(2);
serviceSubtaskCountReq.setExcep("1");
break;
- case "suggest6CountAgainInfo":
- // 鍐嶆闅忚鍥為櫌澶嶈瘖澶嶆煡锛歷isitCount > 1 涓� suggest = 6
+ case "suggest7CountAgainInfo":
+ // 鍐嶆闅忚鍥為櫌澶嶈瘖澶嶆煡锛歷isitCount > 1 涓� suggest = 7
serviceSubtaskCountReq.setVisitCount(2);
- serviceSubtaskCountReq.setSuggest("6");
+ serviceSubtaskCountReq.setSuggest("7");
break;
case "taskSituation1Info":
serviceSubtaskCountReq.setTaskSituation(1);
@@ -5688,7 +5688,7 @@
total.setSentAgain(0L);
total.setFollowUpSuccessAgain(0L);
total.setFollowUpFailAgain(0L);
- total.setSuggest6CountAgain(0L);
+ total.setSuggest7CountAgain(0L);
total.setManualAgain(0L);
total.setSmsAgain(0L);
total.setWeChatAgain(0L);
@@ -5733,7 +5733,7 @@
total.setSentAgain(total.getSentAgain() + (stat.getSentAgain() != null ? stat.getSentAgain() : 0L));
total.setFollowUpSuccessAgain(total.getFollowUpSuccessAgain() + (stat.getFollowUpSuccessAgain() != null ? stat.getFollowUpSuccessAgain() : 0L));
total.setFollowUpFailAgain(total.getFollowUpFailAgain() + (stat.getFollowUpFailAgain() != null ? stat.getFollowUpFailAgain() : 0L));
- total.setSuggest6CountAgain(total.getSuggest6CountAgain() + (stat.getSuggest6CountAgain() != null ? stat.getSuggest6CountAgain() : 0L));
+ total.setSuggest7CountAgain(total.getSuggest7CountAgain() + (stat.getSuggest7CountAgain() != null ? stat.getSuggest7CountAgain() : 0L));
total.setManualAgain(total.getManualAgain() + (stat.getManualAgain() != null ? stat.getManualAgain() : 0L));
total.setSmsAgain(total.getSmsAgain() + (stat.getSmsAgain() != null ? stat.getSmsAgain() : 0L));
total.setWeChatAgain(total.getWeChatAgain() + (stat.getWeChatAgain() != null ? stat.getWeChatAgain() : 0L));
--
Gitblit v1.9.3