smartor.git - Gitblit

			@@ -867,10 +867,10 @@
			return "再次随访任务创建失败，找不到对应任务 taskid = " + serviceSubtask.getTaskid() + ", 再请次重试";
			}
			// nexttaskflag=0 表示任务链终止，不允许再生成
			if ("0".equals(serviceTask.getNexttaskflag())) {
			log.info("无需再次随访，任务已标记无后续随访, taskid = {}", serviceSubtask.getTaskid());
			return "无需再次随访，该任务无后续随访安排";
			}
			// if ("0".equals(serviceTask.getNexttaskflag())) {
			// log.info("无需再次随访，任务已标记无后续随访, taskid = {}", serviceSubtask.getTaskid());
			// return "无需再次随访，该任务无后续随访安排";
			// }
			// 幂等校验：同一原任务只允许生成一条二次随访
			ServiceSubtaskEntity againQuery = new ServiceSubtaskEntity();
			againQuery.setUpid(serviceSubtask.getId().intValue());
			@@ -970,6 +970,18 @@
			return "再次随访任务创建失败，患者出院记录不完整或下一任务配置异常, 再请次重试";
			}
			Date now = new Date();
			applyAgainVisitTime(serviceSubtaskAgain, serviceSubtask, nextServiceTask, config, now);
			// 医生处理意见取自本次请求，按下一任务重建子任务时需显式带入，否则不会落库
			if (request != null) {
			serviceSubtaskAgain.setDoctorOpinion(request.getDoctorOpinion());
			serviceSubtaskAgain.setRemark(request.getRemark());
			serviceSubtaskAgain.setDrcode(request.getDrcode());
			serviceSubtaskAgain.setDrname(request.getDrname());
			serviceSubtaskAgain.setNurseId(request.getNurseId());
			serviceSubtaskAgain.setNurseName(request.getNurseName());
			serviceSubtaskAgain.setManagementDoctor(request.getManagementDoctor());
			serviceSubtaskAgain.setManagementDoctorCode(request.getManagementDoctorCode());
			}
			serviceSubtaskAgain.setId(null);
			serviceSubtaskAgain.setUpid(serviceSubtask.getId().intValue());
			serviceSubtaskAgain.setVisitCount(ObjectUtils.isNotEmpty(serviceSubtask.getVisitCount())
			@@ -978,9 +990,6 @@
			serviceSubtaskAgain.setIsVisitAgain(1);
			serviceSubtaskAgain.setCreateTime(now);
			serviceSubtaskAgain.setUpdateTime(now);

			// 二次随访时间：上次随访完成时间（未完成则当前时间）+ 下一任务发送天数；过去时间兜底为当前时间
			applyAgainVisitTime(serviceSubtaskAgain, serviceSubtask, nextServiceTask, config, now);
			// 新任务的随访方式记录本次选择的再次随访方式；resource 本身不落库
			serviceSubtaskAgain.setVisitType(resource);
			serviceSubtaskAgain.setVisitDeptCode(visitDeptCode);
			@@ -1058,6 +1067,10 @@
			if (dueTime.before(now)) {
			dueTime = now;
			}
			if(ObjectUtils.isNotEmpty(origin.getVisitTime())){
			dueTime = ObjectUtils.isNotEmpty(origin.getVisitTime()) ? origin.getVisitTime() : now;
			}

			target.setLongSendTime(dueTime);
			Date visitTime = dueTime;
			if ("3".equals(nextTask.getType())) {
			@@ -4135,7 +4148,7 @@
			}

			/**
			* 再次随访附加统计：待随访、已发送、人工电话超时及回院复诊复查（suggest=6）。
			* 再次随访附加统计：待随访、已发送、人工电话超时及回院复诊复查（suggest=7）。
			*/
			private void applyAgainFollowUpExtraStatistics(ServiceSubtaskStatistic statistic, ServiceSubtask serviceSubtask) {
			if (serviceSubtask.getVisitCount() == null \|\| serviceSubtask.getVisitCount() <= 1) {
			@@ -4145,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);
			@@ -4954,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
			*
			*/
			@@ -5139,10 +5152,10 @@
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setExcep("1");
			break;
			case "suggest6CountAgainInfo":
			// 再次随访回院复诊复查：visitCount > 1 且 suggest = 6
			case "suggest7CountAgainInfo":
			// 再次随访回院复诊复查：visitCount > 1 且 suggest = 7
			serviceSubtaskCountReq.setVisitCount(2);
			serviceSubtaskCountReq.setSuggest("6");
			serviceSubtaskCountReq.setSuggest("7");
			break;
			case "taskSituation1Info":
			serviceSubtaskCountReq.setTaskSituation(1);
			@@ -5675,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);
			@@ -5720,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));