From a2dd5b42824eff9626d1f48e1561be85f17f6107 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 23 十月 2026 16:36:19 +0800
Subject: [PATCH] 【丽水】指标统计查看详情里面问题重复了，本来应该只有3条，里面18条
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 255 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 224 insertions(+), 31 deletions(-)
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 bece80f..a170ee4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -14,7 +14,7 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.common.utils.sms.smsUtils;
+import com.ruoyi.common.utils.sms.SmsUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
@@ -964,6 +964,136 @@
} finally {
unlockAgainTask(serviceSubtask.getId(), lockToken);
}
+ }
+
+ /**
+ * 棣栨闅忚浠诲姟瓒呮椂鍚庯紝鎸変笅涓�浠诲姟鑷姩鐢熸垚鍐嶆闅忚浠诲姟锛堥殢璁夸腑蹇冿級銆�
+ * <p>
+ * 瀹氭椂浠诲姟鍏ュ彛 {@code RyTask#dealSubtaskDeadline} 浣跨敤銆備笌鎵嬪姩鍏ュ彛涓�鑷寸殑閮ㄥ垎锛�
+ * 琛ㄥ崟/鍙戦�佹柟寮忓彇涓嬩竴浠诲姟銆侀摼璺� upid + visit_count銆佸彂閫佹柟寮忔槑缁嗗垵濮嬪寲锛�
+ * 宸紓锛氶殢璁夸腑蹇冪瀹ゆ湭閰嶇疆鏃跺洖閫�鍘熶换鍔＄瀹わ紝鍘熶换鍔＄疆涓哄彂閫佸け璐ワ紙sendstate=5锛夈��
+ * <p>
+ * 骞傜瓑锛氬悓涓�鍘熶换鍔″彧鍏佽鐢熸垚涓�鏉″啀娆￠殢璁匡紙Redis 閿� + upid 鏍￠獙 + 鍘熶换鍔℃潯浠舵洿鏂帮級锛�
+ * 澶氳妭鐐�/澶氱嚎绋嬪悓鏃舵壂鎻忔椂锛屽悗鍒扮殑浜嬪姟浼氬湪鏉′欢鏇存柊澶勬嬁鍒� 0 琛屽苟鍥炴粴鏈鎻掑叆銆�
+ *
+ * @param serviceSubtask 宸茶秴鏃剁殑棣栨闅忚瀛愪换鍔�
+ * @return 缁撴灉鎻忚堪
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public String addSubTaskAgainByDeadline(ServiceSubtask serviceSubtask) {
+ if (ObjectUtils.isEmpty(serviceSubtask) || ObjectUtils.isEmpty(serviceSubtask.getId())) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屽師浠诲姟涓嶅瓨鍦�";
+ }
+ String lockToken = tryLockAgainTask(serviceSubtask.getId());
+ if (lockToken == null) {
+ return "鍐嶆闅忚浠诲姟姝ｅ湪鍒涘缓涓紝璇峰嬁閲嶅鎻愪氦";
+ }
+ try {
+ // 骞傜瓑鏍￠獙锛氬悓涓�鍘熶换鍔″彧鍏佽鐢熸垚涓�鏉″啀娆￠殢璁�
+ ServiceSubtaskEntity againQuery = new ServiceSubtaskEntity();
+ againQuery.setUpid(serviceSubtask.getId().intValue());
+ if (CollectionUtils.isNotEmpty(serviceSubtaskMapper.selectServiceSubtaskList(againQuery))) {
+ return "鏃犻渶鍐嶆闅忚锛岃浠诲姟宸茬粡鍐嶆闅忚杩囦簡";
+ }
+ // 鍘熶换鍔″凡琚爣璁颁负涓嶅啀闅忚锛堟墜鍔ㄥ叆鍙ｅ啓杩� is_visit_again=2锛�
+ if (ObjectUtils.isNotEmpty(serviceSubtask.getIsVisitAgain()) && serviceSubtask.getIsVisitAgain() == 2) {
+ return "鏃犻渶鍐嶆闅忚锛岃浠诲姟宸茬粡鍐嶆闅忚杩囦簡";
+ }
+ ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ if (ObjectUtils.isEmpty(serviceTask)) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾壘涓嶅埌瀵瑰簲浠诲姟 taskid = " + serviceSubtask.getTaskid();
+ }
+ if (ObjectUtils.isEmpty(serviceTask.getNexttaskid())) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屼换鍔＄己灏� nexttaskid, taskid = " + serviceSubtask.getTaskid();
+ }
+ ServiceTask nextServiceTask = serviceTaskService.selectServiceTaskByTaskid(serviceTask.getNexttaskid());
+ if (ObjectUtils.isEmpty(nextServiceTask)) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾壘涓嶅埌瀵瑰簲浠诲姟 nexttaskid = " + serviceTask.getNexttaskid();
+ }
+ PatMedInhosp patMedInhosp = selectOutHospRecord(serviceSubtask);
+ if (ObjectUtils.isEmpty(patMedInhosp)) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屼换鍔＄己灏戝搴旂殑鍑洪櫌璁板綍, taskid = " + serviceSubtask.getTaskid();
+ }
+ PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask.getPatid());
+ if (ObjectUtils.isEmpty(patArchive)) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾湭鎵惧埌鎮ｈ�呮。妗�, subTaskId = " + serviceSubtask.getId();
+ }
+ // 闅忚涓績绉戝锛氭湭閰嶇疆锛堟垨绉戝涓嶅瓨鍦級鏃跺洖閫�鍘熶换鍔＄瀹わ紝淇濇寔瓒呮椂鍏ュ彛鍘熸湁琛屼负
+ SysDept visitDept = selectCenterDept(serviceSubtask.getOrgid());
+ String config = configService.selectConfigByKey("visit.early.day");
+ ServiceSubtask serviceSubtaskAgain = patMedInhospService.boxedServiceSubtask(nextServiceTask,
+ patMedInhosp, patArchive, config, 1);
+ if (ObjectUtils.isEmpty(serviceSubtaskAgain) || ObjectUtils.isEmpty(serviceSubtaskAgain.getTaskid())) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾偅鑰呭嚭闄㈣褰曚笉瀹屾暣鎴栦笅涓�浠诲姟閰嶇疆寮傚父, subTaskId = " + serviceSubtask.getId();
+ }
+ Date now = new Date();
+ serviceSubtaskAgain.setId(null);
+ serviceSubtaskAgain.setUpid(serviceSubtask.getId().intValue());
+ serviceSubtaskAgain.setVisitCount(ObjectUtils.isNotEmpty(serviceSubtask.getVisitCount())
+ ? serviceSubtask.getVisitCount() + 1 : 2);
+ serviceSubtaskAgain.setSendstate(2L);
+ serviceSubtaskAgain.setIsVisitAgain(1);
+ serviceSubtaskAgain.setCreateTime(now);
+ serviceSubtaskAgain.setUpdateTime(now);
+ serviceSubtaskAgain.setVisitType(serviceSubtask.getVisitType());
+ if (ObjectUtils.isNotEmpty(visitDept)) {
+ serviceSubtaskAgain.setVisitDeptCode(visitDept.getDeptCode());
+ serviceSubtaskAgain.setVisitDeptName(visitDept.getDeptName());
+ } else {
+ serviceSubtaskAgain.setVisitDeptCode(serviceSubtask.getVisitDeptCode());
+ serviceSubtaskAgain.setVisitDeptName(serviceSubtask.getVisitDeptName());
+ }
+ if (serviceSubtaskMapper.insertServiceSubtask(serviceSubtaskAgain) != 1) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屽啀璇锋閲嶈瘯";
+ }
+ // 鍒濆鍖栧彂閫佹柟寮忔槑缁嗭紝琛ュ伩锛坈ompensateTask锛夊拰瓒呮椂鍒ゆ柇渚濊禆璇ヨ〃
+ patMedInhospService.addServiceSubtaskPreachform(serviceSubtaskAgain, null);
+ // 鏉′欢鏇存柊鍘熶换鍔★細0 琛岃鏄庡凡琚叾浠栬姹傜敓鎴愶紝鎶涘紓甯稿洖婊氭湰娆℃彃鍏ョ殑閲嶅鏁版嵁
+ if (serviceSubtaskMapper.updateIsVisitAgainById(serviceSubtask.getId(), 2) != 1) {
+ throw new BaseException("鏃犻渶鍐嶆闅忚锛岃浠诲姟宸茬粡鍐嶆闅忚杩囦簡");
+ }
+ // 鍘熶换鍔¤秴鏃讹紝缃负鍙戦�佸け璐�
+ ServiceSubtask originUpdate = new ServiceSubtask();
+ originUpdate.setId(serviceSubtask.getId());
+ originUpdate.setSendstate(5L);
+ originUpdate.setUpdateTime(now);
+ serviceSubtaskMapper.updateServiceSubtask(originUpdate);
+ return "鍐嶆闅忚浠诲姟鍒涘缓鎴愬姛";
+ } finally {
+ unlockAgainTask(serviceSubtask.getId(), lockToken);
+ }
+ }
+
+ /**
+ * 鎸� orgid + inhospid 鍙栧嚭闄㈣褰曪紙瓒呮椂鍐嶆闅忚鐢級銆�
+ */
+ private PatMedInhosp selectOutHospRecord(ServiceSubtask serviceSubtask) {
+ PatMedInhosp patMedInhospVo = new PatMedInhosp();
+ patMedInhospVo.setOrgid(serviceSubtask.getOrgid());
+ patMedInhospVo.setInhospid(serviceSubtask.getInhospid());
+ patMedInhospVo.setCry(1);
+ List<PatMedInhosp> patMedInhospList = patMedInhospService.selectPatMedInhospList(patMedInhospVo);
+ if (CollectionUtils.isEmpty(patMedInhospList)) {
+ return null;
+ }
+ return patMedInhospList.get(0);
+ }
+
+ /**
+ * 鍙栭殢璁夸腑蹇冪瀹わ紝鏈厤缃垨绉戝涓嶅瓨鍦ㄦ椂杩斿洖 null锛堢敱璋冪敤鏂瑰洖閫�鍘熶换鍔＄瀹わ級銆�
+ */
+ private SysDept selectCenterDept(String orgid) {
+ String centerDept = configService.selectConfigByKey("sys.smartor.center.dept", orgid);
+ if (StringUtils.isEmpty(centerDept)) {
+ return null;
+ }
+ SysDept sysDeptVo = new SysDept();
+ sysDeptVo.setDeptType("1");
+ sysDeptVo.setOrgid(orgid);
+ sysDeptVo.setDeptCode(centerDept);
+ List<SysDept> sysDepts = sysDeptService.selectDeptList(sysDeptVo);
+ return CollectionUtils.isEmpty(sysDepts) ? null : sysDepts.get(0);
}
/**
@@ -3488,6 +3618,10 @@
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
}
+ //鍙婃椂闅忚浜烘锛氬凡瀹屾垚涓旀湭瓒呮椂
+ if (isTimelyFollowUp(serviceSubtask)) {
+ serviceSubtaskStatistic.setTimelyFollowUp(serviceSubtaskStatistic.getTimelyFollowUp() + 1L);
+ }
//浜哄伐宸叉嫧閫氭�婚噺
if (ObjectUtils.isNotEmpty(serviceSubtask.getIsManuallyCalled())
@@ -3756,6 +3890,19 @@
}
/**
+ * 鏄惁灞炰簬銆屽強鏃堕殢璁裤�嶏細闅忚宸插畬鎴愪笖瀹屾垚鏃剁姸鎬佷负姝ｅ父瀹屾垚锛堟湭瓒呮椂锛夈��
+ * <p>
+ * finish_state锛�1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛屽彧鏈� 1 璁″叆鍙婃椂闅忚銆�
+ *
+ * @param serviceSubtask 闅忚瀛愪换鍔�
+ * @return true-璁″叆鍙婃椂闅忚浜烘
+ */
+ private boolean isTimelyFollowUp(ServiceSubtask serviceSubtask) {
+ return serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L)
+ && serviceSubtask.getFinishState() != null && serviceSubtask.getFinishState().equals(1L);
+ }
+
+ /**
* 棣栨闅忚缁熻
*
* @param serviceSubtaskList
@@ -3786,6 +3933,10 @@
//搴旈殢璁夸汉娆�
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
+ }
+ //鍙婃椂闅忚浜烘锛氬凡瀹屾垚涓旀湭瓒呮椂
+ if (isTimelyFollowUp(serviceSubtask)) {
+ serviceSubtaskStatistic.setTimelyFollowUp(serviceSubtaskStatistic.getTimelyFollowUp() + 1L);
}
//棣栨鍑洪櫌闅忚
@@ -3955,6 +4106,10 @@
//搴旈殢璁夸汉娆�
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
+ }
+ //鍙婃椂闅忚浜烘锛氬凡瀹屾垚涓旀湭瓒呮椂
+ if (isTimelyFollowUp(serviceSubtask)) {
+ serviceSubtaskStatistic.setTimelyFollowUp(serviceSubtaskStatistic.getTimelyFollowUp() + 1L);
}
//鍐嶆鍑洪櫌闅忚
@@ -4212,7 +4367,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
serviceSubtaskStatistic.setJoyCount(0);
serviceSubtaskStatistic.setJoyAllCount(0);
-
+ //鍑洪櫌浜烘
+ serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
//鑾峰彇闅忚缁熻
if (subCounts == null) {
subCounts = new ArrayList<>();
@@ -4486,6 +4642,7 @@
* pendingFollowUpInfo - visitCount = 1 && sendstate = 2
* followUpSuccessInfo - visitCount = 1 && sendstate = 6
* followUpFailInfo - visitCount = 1 && (sendstate = 5 || sendstate = 7)
+ * timelyFollowUpInfo - sendstate = 6 && finish_state = 1锛堟部鐢ㄨ姹傜殑 visitCount 鍙ｅ緞锛�
* manualInfo - visitCount = 1 && currentPreachForm = "1"
* voiceInfo - visitCount = 1 && currentPreachForm = "3"
* smsInfo - visitCount = 1 && currentPreachForm = "4"
@@ -4544,14 +4701,22 @@
}
private void applyHyperLinkInfoType(ServiceSubtaskCountReq serviceSubtaskCountReq, String hyperLinkInfoType) {
+ //鍙婃椂闅忚鏄庣粏闇�瑕佹部鐢ㄨ姹傜殑棣栨/鍐嶆鍙ｅ緞
+ Integer originVisitCount = serviceSubtaskCountReq.getVisitCount();
serviceSubtaskCountReq.setVisitCount(null);
serviceSubtaskCountReq.setSendstates(null);
serviceSubtaskCountReq.setCurrentPreachform(null);
serviceSubtaskCountReq.setExcep(null);
serviceSubtaskCountReq.setTaskSituation(null);
+ serviceSubtaskCountReq.setFinishState(null);
switch (hyperLinkInfoType) {
case "dischargeCountInfo":
+ break;
+ case "timelyFollowUpInfo":
+ serviceSubtaskCountReq.setVisitCount(originVisitCount);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
+ serviceSubtaskCountReq.setFinishState(1L);
break;
case "followUpNeededAllInfo":
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
@@ -4587,7 +4752,7 @@
serviceSubtaskCountReq.setVisitCount(1);
serviceSubtaskCountReq.setCurrentPreachform("4");
break;
- case "wechatInfo":
+ case "weChatInfo":
serviceSubtaskCountReq.setVisitCount(1);
serviceSubtaskCountReq.setCurrentPreachform("5");
break;
@@ -4606,7 +4771,7 @@
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
serviceSubtaskCountReq.setCurrentPreachform("4");
break;
- case "wechatSuccessInfo":
+ case "weChatSuccessInfo":
serviceSubtaskCountReq.setVisitCount(1);
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
serviceSubtaskCountReq.setCurrentPreachform("5");
@@ -4643,7 +4808,7 @@
serviceSubtaskCountReq.setVisitCount(2);
serviceSubtaskCountReq.setCurrentPreachform("4");
break;
- case "wechatAgainInfo":
+ case "weChatAgainInfo":
serviceSubtaskCountReq.setVisitCount(2);
serviceSubtaskCountReq.setCurrentPreachform("5");
break;
@@ -4662,7 +4827,7 @@
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
serviceSubtaskCountReq.setCurrentPreachform("4");
break;
- case "wechatAgainSuccessInfo":
+ case "weChatAgainSuccessInfo":
serviceSubtaskCountReq.setVisitCount(2);
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
serviceSubtaskCountReq.setCurrentPreachform("5");
@@ -4709,7 +4874,7 @@
* @return
*/
@Override
- @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+// @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
@@ -4717,13 +4882,13 @@
// 鏍规嵁鏉′欢杩涜鍒嗙粍
Map<String, List<ServiceSubtask>> collect = new HashMap<>();
String groupKey = "drcode";
- if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && !serviceSubtaskCountReq.getLeavehospitaldistrictcodes().isEmpty()) {
+ if (serviceSubtaskCountReq.getStatisticaltype() != null && serviceSubtaskCountReq.getStatisticaltype() == 1) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
groupKey = "drcode";
} else {
groupKey = "leavehospitaldistrictcode";
}
- } else if (serviceSubtaskCountReq.getDeptcodes() != null && !serviceSubtaskCountReq.getDeptcodes().isEmpty()) {
+ } else if (serviceSubtaskCountReq.getStatisticaltype() != null && serviceSubtaskCountReq.getStatisticaltype() == 2) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
groupKey = "drcode";
} else {
@@ -4839,8 +5004,7 @@
}
@Override
- public Map<String, ServiceSubtaskScriptCount> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq) {
- Map<String, ServiceSubtaskScriptCount> result = new HashMap<>();
+ public Map<String, Object> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq) {
List<ServiceSubtaskScriptCount> allCounts = new ArrayList<>();
List<ServiceSubtaskScriptCount> allItemCounts = new ArrayList<>();
String type = serviceSubtaskCountReq.getType();
@@ -4864,7 +5028,23 @@
allItemCounts = serviceSubtaskMapper.getSfStatisticsScriptItemDetails(serviceSubtaskCountReq);
}
- for (ServiceSubtaskScriptCount count : allCounts) {
+ //杩斿洖缁撴瀯鏄� Map锛屼笖涓嶄紶 type 鏃朵細鎵ц涓ゆ潯 SQL锛孭ageHelper 娌℃硶瀵规暣浣撳垎椤碉紝
+ //鎵�浠ュ湪棰樼洰鍚堝苟瀹屾垚涔嬪悗鎸夐鐩紙scriptid锛夊湪杩欓噷鍒嗛〉锛屼繚璇� total 鍜屾瘡椤垫暟鎹兘鏄鐩淮搴︾殑銆�
+ allCounts.sort(Comparator
+ .comparing(ServiceSubtaskScriptCount::getSubtaskType, Comparator.nullsLast(String::compareTo))
+ .thenComparing(ServiceSubtaskScriptCount::getScriptid, Comparator.nullsLast(Long::compareTo)));
+
+ int pageNum = ObjectUtils.isNotEmpty(serviceSubtaskCountReq.getPageNum()) && serviceSubtaskCountReq.getPageNum() > 0
+ ? serviceSubtaskCountReq.getPageNum() : 1;
+ int pageSize = ObjectUtils.isNotEmpty(serviceSubtaskCountReq.getPageSize()) && serviceSubtaskCountReq.getPageSize() > 0
+ ? serviceSubtaskCountReq.getPageSize() : 10;
+ int total = allCounts.size();
+ int fromIndex = (int) Math.min((long) (pageNum - 1) * pageSize, total);
+ int toIndex = Math.min(fromIndex + pageSize, total);
+ List<ServiceSubtaskScriptCount> pageCounts = allCounts.subList(fromIndex, toIndex);
+
+ Map<String, ServiceSubtaskScriptCount> pageData = new LinkedHashMap<>();
+ for (ServiceSubtaskScriptCount count : pageCounts) {
Map<String, ServiceSubtaskScriptCount> itemCountMap = new HashMap<>();
//闂嵎鍔犱笂绌虹櫧閫夐」
if (ObjectUtils.isNotEmpty(count.getTemplateid()) && ObjectUtils.isNotEmpty(count.getSubtaskType()) && count.getSubtaskType().equals("2")) {
@@ -4895,31 +5075,42 @@
}
}
allItemCounts.forEach(itemCount -> {
- if (ObjectUtils.isNotEmpty(count.getScriptid()) && ObjectUtils.isNotEmpty(itemCount.getScriptid())) {
- if (count.getScriptid().equals(itemCount.getScriptid())) {
- //鏀惧叆缁熻淇℃伅
- itemCount.setScriptContent(count.getScriptContent());
- itemCount.setScriptType(count.getScriptType());
- itemCount.setSubtaskType(count.getSubtaskType());
- itemCount.setCompletedQuantity(count.getCompletedQuantity());
- itemCount.setAllQuantity(count.getAllQuantity());
- itemCount.setCompletedPercentage(count.getCompletedPercentage());
- itemCount.setTemplateid(count.getTemplateid());
- //璁＄畻閫夋嫨姣斾緥
- int chosenQuantity = ObjectUtils.isNotEmpty(itemCount.getChosenQuantity()) ? itemCount.getChosenQuantity() : 0;
- int completedQuantity = itemCount.getCompletedQuantity();
- if (ObjectUtils.isNotEmpty(completedQuantity) && completedQuantity != 0) {
- BigDecimal chosenPercentage = (new BigDecimal(chosenQuantity)).divide(new BigDecimal(completedQuantity), 2, RoundingMode.HALF_UP);
- itemCount.setChosenPercentage(chosenPercentage.toString());
- }
- itemCountMap.put(itemCount.getOptionText(), itemCount);
+ //鏄庣粏琛屽凡鎸夆�滈鐩唴瀹�+浠诲姟绫诲瀷鈥濊仛鍚堝苟甯﹀嚭 script_content锛屼笉鑳界敤 scriptid 鍖归厤锛�
+ //鍚屼竴閬撻浼氳澶嶅埗鍒板涓换鍔℃ā鏉匡紝姣忎釜妯℃澘鐨� scriptid 閮戒笉鍚�
+ boolean sameQuestion = ObjectUtils.isNotEmpty(count.getScriptContent())
+ && ObjectUtils.isNotEmpty(itemCount.getScriptContent())
+ && count.getScriptContent().equals(itemCount.getScriptContent())
+ && Objects.equals(count.getSubtaskType(), itemCount.getSubtaskType());
+ if (sameQuestion) {
+ //鏀惧叆缁熻淇℃伅
+ itemCount.setScriptContent(count.getScriptContent());
+ itemCount.setScriptType(count.getScriptType());
+ itemCount.setSubtaskType(count.getSubtaskType());
+ itemCount.setCompletedQuantity(count.getCompletedQuantity());
+ itemCount.setAllQuantity(count.getAllQuantity());
+ itemCount.setCompletedPercentage(count.getCompletedPercentage());
+ itemCount.setTemplateid(count.getTemplateid());
+ //璁＄畻閫夋嫨姣斾緥
+ int chosenQuantity = ObjectUtils.isNotEmpty(itemCount.getChosenQuantity()) ? itemCount.getChosenQuantity() : 0;
+ int completedQuantity = itemCount.getCompletedQuantity();
+ if (ObjectUtils.isNotEmpty(completedQuantity) && completedQuantity != 0) {
+ BigDecimal chosenPercentage = (new BigDecimal(chosenQuantity)).divide(new BigDecimal(completedQuantity), 2, RoundingMode.HALF_UP);
+ itemCount.setChosenPercentage(chosenPercentage.toString());
}
+ itemCountMap.put(itemCount.getOptionText(), itemCount);
}
});
List<ServiceSubtaskScriptCount> itemCounts = new ArrayList<>(itemCountMap.values());
count.setDetails(itemCounts);
- result.put(count.getScriptid().toString(), count);
+ pageData.put(count.getScriptid().toString(), count);
}
+ Map<String, Object> result = new HashMap<>();
+ // total 鏄鐩�绘暟锛堝凡鎸夐鐩悎骞讹級锛宺ows/data 鏄綋鍓嶉〉鏁版嵁
+ result.put("total", total);
+ result.put("pageNum", pageNum);
+ result.put("pageSize", pageSize);
+ result.put("rows", new ArrayList<>(pageCounts));
+ result.put("data", pageData);
return result;
}
@@ -5021,6 +5212,7 @@
total.setPendingFollowUp(0L);
total.setFollowUpSuccess(0L);
total.setFollowUpFail(0L);
+ total.setTimelyFollowUp(0L);
total.setManual(0L);
total.setSms(0L);
total.setWeChat(0L);
@@ -5052,6 +5244,7 @@
total.setPendingFollowUp(total.getPendingFollowUp() + (stat.getPendingFollowUp() != null ? stat.getPendingFollowUp() : 0L));
total.setFollowUpSuccess(total.getFollowUpSuccess() + (stat.getFollowUpSuccess() != null ? stat.getFollowUpSuccess() : 0L));
total.setFollowUpFail(total.getFollowUpFail() + (stat.getFollowUpFail() != null ? stat.getFollowUpFail() : 0L));
+ total.setTimelyFollowUp(total.getTimelyFollowUp() + (stat.getTimelyFollowUp() != null ? stat.getTimelyFollowUp() : 0L));
total.setManual(total.getManual() + (stat.getManual() != null ? stat.getManual() : 0L));
total.setSms(total.getSms() + (stat.getSms() != null ? stat.getSms() : 0L));
total.setWeChat(total.getWeChat() + (stat.getWeChat() != null ? stat.getWeChat() : 0L));
--
Gitblit v1.9.3