smartor.git - Gitblit

			@@ -166,7 +166,7 @@
			private Integer phoneEndHour;

			@Autowired
			private Icd10Mapper icd10Mapper;
			private IPatMedOuthospService patMedOuthospService;

			@Value("${spring.profiles.active}")
			private String active;
			@@ -348,6 +348,20 @@

			@Override
			public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity) {
			if (serviceSubtaskEntity.getSendstateView() != null) {
			// 1：待随访（2 待发送）；2：随访中（3 已发送、1 被领取）、3：未完成（5 发送失败、7、超时）、4：已完成（ 6 已完成）、5：无需随访（4 不执行）
			if (serviceSubtaskEntity.getSendstateView() == 1)
			serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(2L)));
			if (serviceSubtaskEntity.getSendstateView() == 2)
			serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 3L)));
			if (serviceSubtaskEntity.getSendstateView() == 3)
			serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
			if (serviceSubtaskEntity.getSendstateView() == 4)
			serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
			if (serviceSubtaskEntity.getSendstateView() == 5)
			serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
			}

			List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskEntity);

			List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
			@@ -356,6 +370,14 @@
			if (ObjectUtils.isNotEmpty(serviceSubtask.getContinueContent())) {
			serviceSubtaskRes.setContinueContent(serviceSubtask.getContinueContent());
			}
			// 1：待随访（2 待发送）；2：随访中（3 已发送、1 被领取）、3：未完成（5 发送失败、7、超时）、4：已完成（ 6 已完成）、5：无需随访（4 不执行）
			if (serviceSubtaskRes.getSendstate() == 2) serviceSubtaskRes.setSendstateView(1L);
			if (serviceSubtaskRes.getSendstate() == 1 \|\| serviceSubtaskRes.getSendstate() == 3L)
			serviceSubtaskRes.setSendstateView(2L);
			if (serviceSubtaskRes.getSendstate() == 5 \|\| serviceSubtaskRes.getSendstate() == 7L)
			serviceSubtaskRes.setSendstateView(3L);
			if (serviceSubtaskRes.getSendstate() == 6) serviceSubtaskRes.setSendstateView(4L);
			if (serviceSubtaskRes.getSendstate() == 4) serviceSubtaskRes.setSendstateView(5L);
			serviceSubtaskResList.add(serviceSubtaskRes);
			}
			return serviceSubtaskResList;
			@@ -730,9 +752,8 @@
			serviceSubtask.setPatid(patTaskRelevance.getPatid());
			serviceSubtask.setCreateTime(DateUtils.getNowDate());
			serviceSubtask.setInhospid(patTaskRelevance.getHospid());
			serviceSubtask.setSendstate(1L);
			if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1)
			serviceSubtask.setSendstate(2L);
			//新建完成就是待发送状态
			serviceSubtask.setSendstate(2L);
			serviceSubtask.setDeptcode(patTaskRelevance.getDeptcode());
			serviceSubtask.setDeptname(patTaskRelevance.getDeptName());
			serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
			@@ -787,7 +808,6 @@
			serviceTask.setSendTimeSlot(JSON.toJSONString(serviceTaskVO.getSendTimeslot()));
			//修改操作，需要将stopState状态+1
			ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceTask.getTaskid());
			//获取到该任务所有的服务，并从队列里删除
			ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
			serviceSubtaskVO.setTaskid(serviceTask1.getTaskid());
			serviceSubtaskVO.setSendstate(2L);
			@@ -809,6 +829,30 @@
			redisCache.removeElementFromList("cache-2", serviceSubtask.getId().toString());
			redisCache.removeElementFromList("cache-3", serviceSubtask.getId().toString());
			redisCache.removeElementFromList("cache-4", serviceSubtask.getId().toString());
			//将出入院表的数据，还原成还未处理的状态
			if (serviceSubtask.getServiceType().equals("2")) {
			ServiceTask st = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
			//如果任务是长期任务，需要将该患者的出入院数据还原成还未处理的状态
			if (st != null && st.getLongTask() == 1) {
			PatMedInhosp patMedInhosp = new PatMedInhosp();
			patMedInhosp.setDeptcheckFlag("0");
			patMedInhosp.setWardcheckFlag("0");
			patMedInhosp.setDiagcheckFlag("0");
			patMedInhosp.setInhospid(serviceSubtask.getInhospid());
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
			}
			} else if (serviceSubtask.getServiceType().equals("3")) {
			if (serviceSubtask.getInhospid() != null) {
			PatMedOuthospQueryReq req = new PatMedOuthospQueryReq();
			req.setOuthospno(serviceSubtask.getHospno());
			List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(req);
			if (CollectionUtils.isNotEmpty(patMedOuthosps)) {
			PatMedOuthosp patMedOuthosp = patMedOuthosps.get(0);
			patMedOuthosp.setServerState("0");
			patMedOuthospService.updatePatMedOuthosp(patMedOuthosp);
			}
			}
			}
			}
			}

			@@ -874,12 +918,13 @@
			}
			serviceTaskdiag.setLongtask(Long.valueOf(serviceTask.getLongTask()));
			serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
			serviceTaskdiag.setGuid(serviceTask.getGuid());
			serviceTaskdiag.setOrgid(serviceTask.getOrgid());
			serviceTaskdiag.setDeptCode(serviceTaskVO.getDeptcode());
			serviceTaskdiag.setDeptName(serviceTaskVO.getDeptname());
			serviceTaskdiag.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
			serviceTaskdiag.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
			serviceTaskdiag.setGuid(serviceTask1.getGuid());
			serviceTaskdiag.setServiceType(serviceTask1.getServiceType());
			serviceTaskdiag.setOrgid(serviceTask1.getOrgid());
			serviceTaskdiag.setDeptCode(serviceTask1.getDeptcode());
			serviceTaskdiag.setDeptName(serviceTask1.getDeptname());
			serviceTaskdiag.setWardCode(serviceTask1.getLeavehospitaldistrictcode());
			serviceTaskdiag.setWardName(serviceTask1.getLeavehospitaldistrictname());
			serviceTaskdiag.setUpdateTime(new Date());
			if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
			String[] icd10codes = serviceTaskVO.getIcd10code().split(",");
			@@ -2176,6 +2221,8 @@
			IvrTaskTemplateScript ivrTaskTemplateScript = iIvrTaskTemplateScriptService.selectIvrTaskTemplateScriptByID(serviceSubtaskDetail.getScriptid());
			if (ivrTaskTemplateScript != null)
			serviceSubtaskDetail.setCategoryid(ivrTaskTemplateScript.getScriptAssortid());
			serviceSubtaskDetail.setIsMydException(ivrTaskTemplateScript.getIsMydException());
			serviceSubtaskDetail.setDimension(ivrTaskTemplateScript.getDimension());
			}

			serviceSubtaskDetail.setSubId(selectServiceSubtaskList.get(0).getId());
			@@ -2551,7 +2598,6 @@
			if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() > 0) {
			if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
			collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));

			} else {
			collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
			}
			@@ -2730,62 +2776,12 @@
			serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
			//出院人次
			serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
			//出院人次详情
			serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
			//无需随访详情
			List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
			//记录过滤患者详情
			List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();
			//记录首次应随访详情
			List<ServiceSubtask> needFollowUpInfo = new ArrayList<>();
			//记录首次待随访详情
			List<ServiceSubtask> pendingFollowUpInfo = new ArrayList<>();
			//记录首次随访成功详情
			List<ServiceSubtask> followUpSuccessInfo = new ArrayList<>();
			//记录首次随访失败详情
			List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
			//记录首次随访人工详情
			List<ServiceSubtask> manualInfo = new ArrayList<>();
			//记录首次随访语音详情
			List<ServiceSubtask> voiceInfo = new ArrayList<>();
			//记录首次随访短信详情
			List<ServiceSubtask> smsInfo = new ArrayList<>();
			//记录首次随访微信详情
			List<ServiceSubtask> wechatInfo = new ArrayList<>();

			//记录再次应随访详情
			List<ServiceSubtask> needFollowUpAgainInfo = new ArrayList<>();
			//记录再次待随访详情
			List<ServiceSubtask> pendingFollowUpAgainInfo = new ArrayList<>();
			//记录再次随访成功详情
			List<ServiceSubtask> followUpSuccessAgainInfo = new ArrayList<>();
			//记录再次随访失败详情
			List<ServiceSubtask> followUpFailAgainInfo = new ArrayList<>();
			//记录再次随访人工详情
			List<ServiceSubtask> manualAgainInfo = new ArrayList<>();
			//记录再次随访语音详情
			List<ServiceSubtask> voiceAgainInfo = new ArrayList<>();
			//记录再次随访短信详情
			List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
			//记录再次随访微信详情
			List<ServiceSubtask> wechatAgainInfo = new ArrayList<>();

			//记录随访情况详情
			List<ServiceSubtask> taskSituation1Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation6Info = new ArrayList<>();

			for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
			//无需随访人次
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
			serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
			nonFollowUpInfo.add(serviceSubtask);
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
			serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
			filterServiceSubtasks.add(serviceSubtask);
			}
			}
			//应随访人次
			@@ -2798,72 +2794,80 @@
			//首次应随访
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
			serviceSubtaskStatistic.setNeedFollowUp(serviceSubtaskStatistic.getNeedFollowUp() + 1L);
			needFollowUpInfo.add(serviceSubtask);
			}
			//首次待随访
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
			serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
			pendingFollowUpInfo.add(serviceSubtask);
			}
			//首次随访失败(包括随访失败+人工超时)
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 5 \|\| serviceSubtask.getSendstate() == 7)) {
			serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
			followUpFailInfo.add(serviceSubtask);
			}
			/**
			* 不同统计方式下不同的随访成功数参数 followUpCountStyle 控制
			*/
			if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")) {
			//首次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6L)) {
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
			serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
			followUpSuccessInfo.add(serviceSubtask);
			}
			//首次随访人工 (不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
			manualInfo.add(serviceSubtask);
			}
			//首次随访语音 (不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
			voiceInfo.add(serviceSubtask);
			}
			//首次随访短信(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
			smsInfo.add(serviceSubtask);
			}
			//首次随访微信(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
			wechatInfo.add(serviceSubtask);
			}
			} else if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("3")) {
			//首次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
			serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
			}
			//首次随访人工 (只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
			}
			//首次随访语音 (只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
			}
			//首次随访短信(只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
			}
			//首次随访微信(只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
			}
			} else {
			//首次随访成功 - 统计时候加上不执行的，已发送的
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L) \|\| serviceSubtask.getSendstate().equals(3L) \|\| serviceSubtask.getSendstate().equals(4L))) {
			serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
			followUpSuccessInfo.add(serviceSubtask);
			}
			//首次随访人工 (统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
			manualInfo.add(serviceSubtask);
			}
			//首次随访语音 (统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
			voiceInfo.add(serviceSubtask);
			}
			//首次随访短信(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
			smsInfo.add(serviceSubtask);
			}
			//首次随访微信(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
			wechatInfo.add(serviceSubtask);
			}
			}
			if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
			@@ -2881,72 +2885,80 @@
			//再次应随访
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
			serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
			needFollowUpAgainInfo.add(serviceSubtask);
			}
			//再次待随访
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
			serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
			pendingFollowUpAgainInfo.add(serviceSubtask);
			}
			//再次随访失败
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
			serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
			followUpFailAgainInfo.add(serviceSubtask);
			}
			/**
			* 不同统计方式下不同的随访成功数参数 followUpCountStyle 控制
			*/
			if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")) {
			//再次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 \|\| serviceSubtask.getSendstate() == 3 \|\| serviceSubtask.getSendstate() == 6)) {
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L)) {
			serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
			followUpSuccessAgainInfo.add(serviceSubtask);
			}
			//再次随访人工(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
			manualAgainInfo.add(serviceSubtask);
			}
			//再次随访语音(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
			voiceAgainInfo.add(serviceSubtask);
			}
			//再次随访短信(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
			smsAgainInfo.add(serviceSubtask);
			}
			//再次随访微信(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
			wechatAgainInfo.add(serviceSubtask);
			}
			} else if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("3")) {
			//再次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
			serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
			}
			//再次随访人工 (只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
			}
			//再次随访语音 (只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
			}
			//再次随访短信(只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
			}
			//再次随访微信(只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
			}
			} else {
			//再次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(1L) \|\| serviceSubtask.getSendstate().equals(6L) \|\| serviceSubtask.getSendstate().equals(3L) \|\| serviceSubtask.getSendstate().equals(4L))) {
			serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
			followUpSuccessAgainInfo.add(serviceSubtask);
			}
			//再次随访人工(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
			manualAgainInfo.add(serviceSubtask);
			}
			//再次随访语音(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
			voiceAgainInfo.add(serviceSubtask);
			}
			//再次随访短信(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
			smsAgainInfo.add(serviceSubtask);
			}
			//再次随访微信(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
			wechatAgainInfo.add(serviceSubtask);
			}
			}
			if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
			@@ -2963,72 +2975,23 @@
			//随访情况
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
			serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
			taskSituation1Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
			serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
			taskSituation2Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
			serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
			taskSituation3Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
			serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
			taskSituation4Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
			serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
			taskSituation5Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
			serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
			taskSituation6Info.add(serviceSubtask);
			}
			}
			serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
			//记录无需随访详情
			serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
			//记录首次应随访详情
			serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
			//记录首次待随访详情
			serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
			//记录首次随访成功详情
			serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
			//记录首次随访失败详情
			serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
			//记录首次随访人工详情
			serviceSubtaskStatistic.setManualInfo(manualInfo);
			//记录首次随访语音详情
			serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
			//记录首次随访短信详情
			serviceSubtaskStatistic.setSmsInfo(smsInfo);
			//记录首次随访微信详情
			serviceSubtaskStatistic.setWechatInfo(wechatInfo);
			//记录再次应随访详情
			serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
			//记录再次待随访详情
			serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
			//记录再次随访成功详情
			serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
			//记录再次随访失败详情
			serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
			//记录再次随访人工详情
			serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
			//记录再次随访语音详情
			serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
			//记录再次随访短信详情
			serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
			//记录再次随访微信详情
			serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);

			//随访情况详情
			serviceSubtaskStatistic.setTaskSituation1Info(taskSituation1Info);
			serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
			serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
			serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
			serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
			serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
			return serviceSubtaskStatistic;
			}
			return serviceSubtaskStatistic;
			@@ -3053,45 +3016,13 @@
			serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
			//出院人次
			serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
			//出院人次详情
			serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
			//无需随访详情
			List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
			//记录过滤患者详情
			List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();
			//记录首次应随访详情
			List<ServiceSubtask> needFollowUpInfo = new ArrayList<>();
			//记录首次待随访详情
			List<ServiceSubtask> pendingFollowUpInfo = new ArrayList<>();
			//记录首次随访成功详情
			List<ServiceSubtask> followUpSuccessInfo = new ArrayList<>();
			//记录首次随访失败详情
			List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
			//记录首次随访人工详情
			List<ServiceSubtask> manualInfo = new ArrayList<>();
			//记录首次随访语音详情
			List<ServiceSubtask> voiceInfo = new ArrayList<>();
			//记录首次随访短信详情
			List<ServiceSubtask> smsInfo = new ArrayList<>();
			//记录首次随访微信详情
			List<ServiceSubtask> wechatInfo = new ArrayList<>();

			//记录随访情况详情
			List<ServiceSubtask> taskSituation1Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation6Info = new ArrayList<>();

			for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
			//无需随访人次
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
			serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
			nonFollowUpInfo.add(serviceSubtask);
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
			serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
			filterServiceSubtasks.add(serviceSubtask);
			}
			}
			//应随访人次
			@@ -3104,72 +3035,80 @@
			//首次应随访
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
			serviceSubtaskStatistic.setNeedFollowUp(serviceSubtaskStatistic.getNeedFollowUp() + 1L);
			needFollowUpInfo.add(serviceSubtask);
			}
			//首次待随访
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
			serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
			pendingFollowUpInfo.add(serviceSubtask);
			}
			//首次随访失败(包括随访失败+人工超时)
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 5 \|\| serviceSubtask.getSendstate() == 7)) {
			serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
			followUpFailInfo.add(serviceSubtask);
			}
			/**
			* 不同统计方式下不同的随访成功数参数 followUpCountStyle 控制
			*/
			if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")) {
			//首次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6L)) {
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
			serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
			followUpSuccessInfo.add(serviceSubtask);
			}
			//首次随访人工 (不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
			manualInfo.add(serviceSubtask);
			}
			//首次随访语音 (不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
			voiceInfo.add(serviceSubtask);
			}
			//首次随访短信(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
			smsInfo.add(serviceSubtask);
			}
			//首次随访微信(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
			wechatInfo.add(serviceSubtask);
			}
			} else if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("3")) {
			//首次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
			serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
			}
			//首次随访人工 (只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
			}
			//首次随访语音 (只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
			}
			//首次随访短信(只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
			}
			//首次随访微信(只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
			}
			} else {
			//首次随访成功 - 统计时候加上不执行的，已发送的
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L) \|\| serviceSubtask.getSendstate().equals(3L) \|\| serviceSubtask.getSendstate().equals(4L))) {
			serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
			followUpSuccessInfo.add(serviceSubtask);
			}
			//首次随访人工 (统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
			manualInfo.add(serviceSubtask);
			}
			//首次随访语音 (统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
			voiceInfo.add(serviceSubtask);
			}
			//首次随访短信(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
			smsInfo.add(serviceSubtask);
			}
			//首次随访微信(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
			wechatInfo.add(serviceSubtask);
			}
			}
			if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
			@@ -3186,56 +3125,23 @@
			//随访情况
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
			serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
			taskSituation1Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
			serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
			taskSituation2Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
			serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
			taskSituation3Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
			serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
			taskSituation4Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
			serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
			taskSituation5Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
			serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
			taskSituation6Info.add(serviceSubtask);
			}
			}
			serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
			//记录无需随访详情
			serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
			//记录首次应随访详情
			serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
			//记录首次待随访详情
			serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
			//记录首次随访成功详情
			serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
			//记录首次随访失败详情
			serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
			//记录首次随访人工详情
			serviceSubtaskStatistic.setManualInfo(manualInfo);
			//记录首次随访语音详情
			serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
			//记录首次随访短信详情
			serviceSubtaskStatistic.setSmsInfo(smsInfo);
			//记录首次随访微信详情
			serviceSubtaskStatistic.setWechatInfo(wechatInfo);

			//随访情况详情
			serviceSubtaskStatistic.setTaskSituation1Info(taskSituation1Info);
			serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
			serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
			serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
			serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
			serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
			return serviceSubtaskStatistic;
			}

			@@ -3258,46 +3164,12 @@
			serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
			//出院人次
			serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
			//出院人次详情
			serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
			//无需随访详情
			List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
			//记录过滤患者详情
			List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();

			//记录再次应随访详情
			List<ServiceSubtask> needFollowUpAgainInfo = new ArrayList<>();
			//记录再次待随访详情
			List<ServiceSubtask> pendingFollowUpAgainInfo = new ArrayList<>();
			//记录再次随访成功详情
			List<ServiceSubtask> followUpSuccessAgainInfo = new ArrayList<>();
			//记录再次随访失败详情
			List<ServiceSubtask> followUpFailAgainInfo = new ArrayList<>();
			//记录再次随访人工详情
			List<ServiceSubtask> manualAgainInfo = new ArrayList<>();
			//记录再次随访语音详情
			List<ServiceSubtask> voiceAgainInfo = new ArrayList<>();
			//记录再次随访短信详情
			List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
			//记录再次随访微信详情
			List<ServiceSubtask> wechatAgainInfo = new ArrayList<>();

			//记录随访情况详情
			List<ServiceSubtask> taskSituation1Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
			List<ServiceSubtask> taskSituation6Info = new ArrayList<>();

			for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
			//无需随访人次
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
			serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
			nonFollowUpInfo.add(serviceSubtask);
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
			serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
			filterServiceSubtasks.add(serviceSubtask);
			}
			}
			//应随访人次
			@@ -3310,72 +3182,80 @@
			//再次应随访
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
			serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
			needFollowUpAgainInfo.add(serviceSubtask);
			}
			//再次待随访
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
			serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
			pendingFollowUpAgainInfo.add(serviceSubtask);
			}
			//再次随访失败
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
			serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
			followUpFailAgainInfo.add(serviceSubtask);
			}
			/**
			* 不同统计方式下不同的随访成功数参数 followUpCountStyle 控制
			*/
			if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")) {
			//再次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 \|\| serviceSubtask.getSendstate() == 3 \|\| serviceSubtask.getSendstate() == 6)) {
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L)) {
			serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
			followUpSuccessAgainInfo.add(serviceSubtask);
			}
			//再次随访人工(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
			manualAgainInfo.add(serviceSubtask);
			}
			//再次随访语音(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
			voiceAgainInfo.add(serviceSubtask);
			}
			//再次随访短信(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
			smsAgainInfo.add(serviceSubtask);
			}
			//再次随访微信(不统计不执行)
			if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
			wechatAgainInfo.add(serviceSubtask);
			}
			} else if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("3")) {
			//再次随访成功
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L)) {
			serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
			}
			//再次随访人工 (只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
			}
			//再次随访语音 (只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
			}
			//再次随访短信(只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
			}
			//首次随访微信(只统计已完成)
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
			}
			} else {
			//再次随访成功
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(1L) \|\| serviceSubtask.getSendstate().equals(6L) \|\| serviceSubtask.getSendstate().equals(3L) \|\| serviceSubtask.getSendstate().equals(4L))) {
			serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
			followUpSuccessAgainInfo.add(serviceSubtask);
			}
			//再次随访人工(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
			manualAgainInfo.add(serviceSubtask);
			}
			//再次随访语音(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
			voiceAgainInfo.add(serviceSubtask);
			}
			//再次随访短信(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
			smsAgainInfo.add(serviceSubtask);
			}
			//再次随访微信(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
			wechatAgainInfo.add(serviceSubtask);
			}
			}
			if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
			@@ -3392,56 +3272,23 @@
			//随访情况
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
			serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
			taskSituation1Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
			serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
			taskSituation2Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
			serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
			taskSituation3Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
			serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
			taskSituation4Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
			serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
			taskSituation5Info.add(serviceSubtask);
			}
			if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
			serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
			taskSituation6Info.add(serviceSubtask);
			}
			}
			serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
			//记录无需随访详情
			serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
			//记录再次应随访详情
			serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
			//记录再次待随访详情
			serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
			//记录再次随访成功详情
			serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
			//记录再次随访失败详情
			serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
			//记录再次随访人工详情
			serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
			//记录再次随访语音详情
			serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
			//记录再次随访短信详情
			serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
			//记录再次随访微信详情
			serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);

			//随访情况详情
			serviceSubtaskStatistic.setTaskSituation1Info(taskSituation1Info);
			serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
			serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
			serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
			serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
			serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
			return serviceSubtaskStatistic;
			}

			@@ -3551,7 +3398,7 @@
			return serviceSubtaskStatistic;
			}

			private ServiceSubtaskStatistic getStatisticCategory(List<ServiceSubtask> serviceSubtaskList, ServiceSubtaskCountReq serviceSubtaskCountReq) {
			private ServiceSubtaskStatistic getStatisticCategory(List<ServiceSubtask> serviceSubtaskList, ServiceSubtaskCountReq serviceSubtaskCountReq, List<ServiceSubtaskCount> subCounts) {
			ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
			//格式化为两位小数的百分比
			DecimalFormat percentFormat = new DecimalFormat("##.##%");
			@@ -3561,68 +3408,13 @@
			serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
			serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
			serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
			//出院人次
			serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
			//出院人次详情
			serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
			serviceSubtaskStatistic.setJoyCount(0);
			serviceSubtaskStatistic.setJoyAllCount(0);

			//获取随访统计
			List<Long> subTaskIds = new ArrayList<>();
			if (ObjectUtils.isNotEmpty(serviceSubtaskList)) {
			subTaskIds = serviceSubtaskList.stream().map(ServiceSubtask::getId) // 提取字段
			.filter(Objects::nonNull) // 过滤 null 值
			.filter(id -> ObjectUtils.isNotEmpty(id)) // 过滤空字符串（可选）
			.distinct() // 去重
			.collect(Collectors.toList()); // 收集到 List
			serviceSubtaskCountReq.setSubTaskIds(subTaskIds);
			if (subCounts == null) {
			subCounts = new ArrayList<>();
			}
			List<ServiceSubtaskCount> subCounts = new ArrayList<>();
			subCounts = serviceSubtaskMapper.getSfStatisticsCategory(serviceSubtaskCountReq);

			//无需随访详情
			List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
			//应随访详情
			List<ServiceSubtask> followUpNeededAllInfo = new ArrayList<>();
			//记录首次应随访详情
			List<ServiceSubtask> needFollowUpInfo = new ArrayList<>();
			//记录首次待随访详情
			List<ServiceSubtask> pendingFollowUpInfo = new ArrayList<>();
			//记录首次随访成功详情
			List<ServiceSubtask> followUpSuccessInfo = new ArrayList<>();
			//记录首次随访失败详情
			List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
			//记录首次随访人工详情
			List<ServiceSubtask> manualInfo = new ArrayList<>();
			//记录首次随访语音详情
			List<ServiceSubtask> voiceInfo = new ArrayList<>();
			//记录首次随访短信详情
			List<ServiceSubtask> smsInfo = new ArrayList<>();
			//记录首次随访微信详情
			List<ServiceSubtask> wechatInfo = new ArrayList<>();

			//记录首次结果异常详情
			List<ServiceSubtask> abnormalInfo = new ArrayList<>();

			//记录再次应随访详情
			List<ServiceSubtask> needFollowUpAgainInfo = new ArrayList<>();
			//记录再次待随访详情
			List<ServiceSubtask> pendingFollowUpAgainInfo = new ArrayList<>();
			//记录再次随访成功详情
			List<ServiceSubtask> followUpSuccessAgainInfo = new ArrayList<>();
			//记录再次随访失败详情
			List<ServiceSubtask> followUpFailAgainInfo = new ArrayList<>();
			//记录再次随访人工详情
			List<ServiceSubtask> manualAgainInfo = new ArrayList<>();
			//记录再次随访语音详情
			List<ServiceSubtask> voiceAgainInfo = new ArrayList<>();
			//记录再次随访短信详情
			List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
			//记录再次随访微信详情
			List<ServiceSubtask> wechatAgainInfo = new ArrayList<>();
			//记录再次结果异常详情
			List<ServiceSubtask> abnormalAgainInfo = new ArrayList<>();


			for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
			@@ -3638,31 +3430,25 @@
			//无需随访人次
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
			serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
			nonFollowUpInfo.add(serviceSubtask);
			}
			//应随访人次
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
			serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
			followUpNeededAllInfo.add(serviceSubtask);
			}

			//首次出院随访
			if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() == 1) {
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
			serviceSubtaskStatistic.setNeedFollowUp(serviceSubtaskStatistic.getNeedFollowUp() + 1L);
			needFollowUpInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
			serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
			pendingFollowUpInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6)) {
			serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
			followUpSuccessInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 5 \|\| serviceSubtask.getSendstate() == 7)) {
			serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
			followUpFailInfo.add(serviceSubtask);
			}
			if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
			double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp();
			@@ -3672,41 +3458,32 @@
			}
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
			manualInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
			voiceInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
			smsInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
			wechatInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
			serviceSubtaskStatistic.setAbnormal(serviceSubtaskStatistic.getAbnormal() + 1L);
			abnormalInfo.add(serviceSubtask);
			}
			}//二次出院随访
			else if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() > 1) {
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
			serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
			needFollowUpAgainInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
			serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
			pendingFollowUpAgainInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 \|\| serviceSubtask.getSendstate() == 3 \|\| serviceSubtask.getSendstate() == 6)) {
			serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
			followUpSuccessAgainInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
			serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
			followUpFailAgainInfo.add(serviceSubtask);
			}
			if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
			double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain();
			@@ -3716,64 +3493,22 @@
			}
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
			serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
			manualAgainInfo.add(serviceSubtask);
			}
			//再次随访语音(统计不执行)
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
			serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
			voiceAgainInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
			serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
			smsAgainInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
			serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
			wechatAgainInfo.add(serviceSubtask);
			}
			if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
			serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
			abnormalAgainInfo.add(serviceSubtask);
			}
			}
			}

			//记录无需随访详情
			serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
			//记录需随访详情
			serviceSubtaskStatistic.setFollowUpNeededAllInfo(followUpNeededAllInfo);
			//记录首次应随访详情
			serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
			//记录首次待随访详情
			serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
			//记录首次随访成功详情
			serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
			//记录首次随访失败详情
			serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
			//记录首次随访人工详情
			serviceSubtaskStatistic.setManualInfo(manualInfo);
			//记录首次随访语音详情
			serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
			//记录首次随访短信详情
			serviceSubtaskStatistic.setSmsInfo(smsInfo);
			//记录首次随访微信详情
			serviceSubtaskStatistic.setWechatInfo(wechatInfo);
			//记录再次应随访详情
			serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
			//记录再次待随访详情
			serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
			//记录再次随访成功详情
			serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
			//记录再次随访失败详情
			serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
			//记录再次随访人工详情
			serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
			//记录再次随访语音详情
			serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
			//记录再次随访短信详情
			serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
			//记录再次随访微信详情
			serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
			return serviceSubtaskStatistic;
			}

			@@ -3937,13 +3672,186 @@
			}

			/**
			* 获取随访统计超链接
			* dischargeCountInfo
			* followUpNeededAllInfo - sendstate != 4 (1,2,3,5,6,7)
			* nonFollowUpInfo - sendstate = 4
			* needFollowUpInfo - visitCount = 1 && sendstate != 4
			* pendingFollowUpInfo - visitCount = 1 && sendstate = 2
			* followUpSuccessInfo - visitCount = 1 && sendstate = 6
			* followUpFailInfo - visitCount = 1 && (sendstate = 5 \|\| sendstate = 7)
			* manualInfo - visitCount = 1 && currentPreachForm = "1"
			* voiceInfo - visitCount = 1 && currentPreachForm = "3"
			* smsInfo - visitCount = 1 && currentPreachForm = "4"
			* wechatInfo - visitCount = 1 && currentPreachForm = "5"
			* abnormalInfo - visitCount = 1 && excep = "1"
			* needFollowUpAgainInfo - visitCount > 1 && sendstate != 4
			* pendingFollowUpAgainInfo - visitCount > 1 && sendstate = 2
			* followUpSuccessAgainInfo - visitCount > 1 && sendstate =6
			* followUpFailAgainInfo - visitCount > 1 && (sendstate = 5 \|\| sendstate = 7)
			* manualAgainInfo - visitCount > 1 && currentPreachForm = "1"
			* voiceAgainInfo - visitCount > 1 && currentPreachForm = "3"
			* smsAgainInfo - visitCount > 1 && currentPreachForm = "4"
			* wechatAgainInfo - visitCount > 1 && currentPreachForm = "5"
			* abnormalAgainInfo- visitCount = 1 && excep = "1"
			* taskSituation1Info - taskSituation = 1
			* taskSituation2Info - taskSituation = 2
			* taskSituation3Info - taskSituation = 3
			* taskSituation4Info - taskSituation = 4
			* taskSituation5Info - taskSituation = 5
			* taskSituation6Info - taskSituation = 7
			* filterCountList - taskSituation = 6 && sendstate = 4
			*
			*/
			@Override
			public List<ServiceSubtask> getSfStatisticsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq) {
			String hyperLinkInfoType = serviceSubtaskCountReq.getHyperLinkInfoType();
			if (StringUtils.isNotEmpty(hyperLinkInfoType)) {
			applyHyperLinkInfoType(serviceSubtaskCountReq, hyperLinkInfoType);
			}

			String followUpCountStyle = serviceSubtaskCountReq.getFollowUpCountStyle();
			/**
			* 统计时算上不发送的
			*/
			if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("2")) {
			List<Long> sendstates = serviceSubtaskCountReq.getSendstates();
			if (CollectionUtils.isNotEmpty(sendstates) && sendstates.get(0).equals(6L)) {
			List<Long> sendstates1 = new ArrayList<>();
			sendstates1.add(3L);
			sendstates1.add(4L);
			sendstates1.add(6L);
			serviceSubtaskCountReq.setSendstates(sendstates1);
			}
			}
			List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.getSfStatisticsHyperlink(serviceSubtaskCountReq);
			return serviceSubtasks;
			}

			private void applyHyperLinkInfoType(ServiceSubtaskCountReq serviceSubtaskCountReq, String hyperLinkInfoType) {
			serviceSubtaskCountReq.setVisitCount(null);
			serviceSubtaskCountReq.setSendstates(null);
			serviceSubtaskCountReq.setCurrentPreachform(null);
			serviceSubtaskCountReq.setExcep(null);
			serviceSubtaskCountReq.setTaskSituation(null);

			switch (hyperLinkInfoType) {
			case "dischargeCountInfo":
			break;
			case "followUpNeededAllInfo":
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
			break;
			case "nonFollowUpInfo":
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
			break;
			case "needFollowUpInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
			break;
			case "pendingFollowUpInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(2L)));
			break;
			case "followUpSuccessInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
			break;
			case "followUpFailInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
			break;
			case "manualInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setCurrentPreachform("1");
			break;
			case "voiceInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setCurrentPreachform("3");
			break;
			case "smsInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setCurrentPreachform("4");
			break;
			case "wechatInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setCurrentPreachform("5");
			break;
			case "abnormalInfo":
			serviceSubtaskCountReq.setVisitCount(1);
			serviceSubtaskCountReq.setExcep("1");
			break;
			case "needFollowUpAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
			break;
			case "pendingFollowUpAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(2L)));
			break;
			case "followUpSuccessAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
			break;
			case "followUpFailAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
			break;
			case "manualAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setCurrentPreachform("1");
			break;
			case "voiceAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setCurrentPreachform("3");
			break;
			case "smsAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setCurrentPreachform("4");
			break;
			case "wechatAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setCurrentPreachform("5");
			break;
			case "abnormalAgainInfo":
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setExcep("1");
			break;
			case "taskSituation1Info":
			serviceSubtaskCountReq.setTaskSituation(1);
			break;
			case "taskSituation2Info":
			serviceSubtaskCountReq.setTaskSituation(2);
			break;
			case "taskSituation3Info":
			serviceSubtaskCountReq.setTaskSituation(3);
			break;
			case "taskSituation4Info":
			serviceSubtaskCountReq.setTaskSituation(4);
			break;
			case "taskSituation5Info":
			serviceSubtaskCountReq.setTaskSituation(5);
			break;
			case "taskSituation6Info":
			serviceSubtaskCountReq.setTaskSituation(7);
			break;
			case "filterCountList":
			serviceSubtaskCountReq.setTaskSituation(6);
			serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
			break;
			default:
			break;
			}
			}


			/**
			* 获取随访统计比例
			*
			* @param serviceSubtaskCountReq
			* @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<>();
			@@ -3984,12 +3892,19 @@
			}
			//获取及时率统计合集
			Map<String, Map<String, Object>> jsRates = getSsRateForSfStatistics(serviceSubtaskCountReq, collect);
			//一次性查询所有分组的题目统计，避免每个分组一次SQL（N+1）
			List<Long> allSubTaskIds = rawData.stream().map(ServiceSubtask::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
			List<ServiceSubtaskCount> subCounts = new ArrayList<>();
			if (CollectionUtils.isNotEmpty(allSubTaskIds)) {
			serviceSubtaskCountReq.setSubTaskIds(allSubTaskIds);
			subCounts = serviceSubtaskMapper.getSfStatisticsCategory(serviceSubtaskCountReq);
			}
			for (String collectKey : collect.keySet()) {
			List<ServiceSubtask> serviceSubtaskList = collect.get(collectKey);
			if (CollectionUtils.isEmpty(serviceSubtaskList)) {
			continue;
			}
			ServiceSubtaskStatistic statistic = getStatisticCategory(serviceSubtaskList, serviceSubtaskCountReq);
			ServiceSubtaskStatistic statistic = getStatisticCategory(serviceSubtaskList, serviceSubtaskCountReq, subCounts);
			if (ObjectUtils.isNotEmpty(jsRates)) {
			Map<String, Object> jsRateMap = jsRates.get(collectKey);
			BigDecimal jsRate = new BigDecimal("0");
			@@ -4026,12 +3941,45 @@
			serviceSubtaskStatistic.setJoyAllCount(sum.intValue());
			serviceSubtaskStatistic.setJoyCount(finishedSum.intValue());
			serviceSubtaskStatistic.setJoyTotal(finishedPercentage);
			clearStatisticDetailInfo(serviceSubtaskStatistic);
			}
			}

			return serviceSubtaskStatistics;
			}

			/**
			* Trim detail lists for summary response to avoid oversized payloads.
			*/
			private void clearStatisticDetailInfo(ServiceSubtaskStatistic serviceSubtaskStatistic) {
			serviceSubtaskStatistic.setDischargeCountInfo(null);
			serviceSubtaskStatistic.setNonFollowUpInfo(null);
			serviceSubtaskStatistic.setFollowUpNeededAllInfo(null);
			serviceSubtaskStatistic.setNeedFollowUpInfo(null);
			serviceSubtaskStatistic.setPendingFollowUpInfo(null);
			serviceSubtaskStatistic.setFollowUpSuccessInfo(null);
			serviceSubtaskStatistic.setFollowUpFailInfo(null);
			serviceSubtaskStatistic.setManualInfo(null);
			serviceSubtaskStatistic.setVoiceInfo(null);
			serviceSubtaskStatistic.setSmsInfo(null);
			serviceSubtaskStatistic.setWechatInfo(null);
			serviceSubtaskStatistic.setNeedFollowUpAgainInfo(null);
			serviceSubtaskStatistic.setPendingFollowUpAgainInfo(null);
			serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(null);
			serviceSubtaskStatistic.setFollowUpFailAgainInfo(null);
			serviceSubtaskStatistic.setManualAgainInfo(null);
			serviceSubtaskStatistic.setVoiceAgainInfo(null);
			serviceSubtaskStatistic.setSmsAgainInfo(null);
			serviceSubtaskStatistic.setWechatAgainInfo(null);
			serviceSubtaskStatistic.setTaskSituation1Info(null);
			serviceSubtaskStatistic.setTaskSituation2Info(null);
			serviceSubtaskStatistic.setTaskSituation3Info(null);
			serviceSubtaskStatistic.setTaskSituation4Info(null);
			serviceSubtaskStatistic.setTaskSituation5Info(null);
			serviceSubtaskStatistic.setTaskSituation6Info(null);
			serviceSubtaskStatistic.setFilterCountList(null);
			}

			@Override
			public Map<String, ServiceSubtaskScriptCount> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq) {
			Map<String, ServiceSubtaskScriptCount> result = new HashMap<>();