smartor.git - Gitblit

			@@ -923,6 +923,13 @@
			serviceSubtaskList.addAll(compensateServiceSubtaskList);
			}
			for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
			//currentPreachform为空，说明该子任务还没有执行过任何一种发送方式(sendstate=1，属于首次补偿)，
			//这里直接交给sfHandlle处理，它会按sort=1的第一种发送方式发送，与getSendPreachform中的处理保持一致
			if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())) {
			log.warn("【compensateTask】subid：{}，currentPreachform为空，按第一种发送方式补偿处理", serviceSubtask.getId());
			sfHandlle(serviceSubtask);
			continue;
			}
			//根据当前的执行方式，获取下一种执行方式
			ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
			serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
			@@ -1131,7 +1138,7 @@
			} else {
			sysConfig = sysConfigMapper.checkConfigKeyUnique("wj.sms.template");
			}
			if (!Objects.isNull(sysConfig)) {
			if (!Objects.isNull(sysConfig) && StringUtils.isNotEmpty(sysConfig.getConfigValue())) {
			String smsContemt = sysConfig.getConfigValue();
			// sendMagParam.setContent("您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
			sendMagParam.setContent(smsContemt.replace("${wjurl}", sendMagParam.getUrl()));
			@@ -1145,7 +1152,7 @@
			sendMagParam.setUrl(url);

			SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique("xj.sms.template");
			if (!Objects.isNull(sysConfig)) {
			if (!Objects.isNull(sysConfig) && StringUtils.isNotEmpty(sysConfig.getConfigValue())) {
			String smsContemt = sysConfig.getConfigValue();
			// sendMagParam.setContent("您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
			sendMagParam.setContent(smsContemt.replace("${xjurl}", sendMagParam.getUrl()));
			@@ -1159,6 +1166,13 @@
			sendMagParam.setContent(content);
			}

			}

			//内容为空说明短信模板未配置或宣教/通知内容为空，直接按发送失败处理，避免后续发送时出现空指针
			if (StringUtils.isEmpty(sendMagParam.getContent())) {
			log.error("【sfHandlle】长期任务短信内容为空，无法发送，subid：{}，taskid：{}，type：{}，机构ID：{}", serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getType(), serviceSubtask.getOrgid());
			setSuccessPreachForm(serviceSubtask, sendPreachform, "长期任务短信发送失败:短信内容为空(短信模板未配置或内容为空), 时间: " + now, "5");
			return;
			}

			serviceOutPath.setRadix(format);
			@@ -1748,14 +1762,15 @@
			* @return
			*/
			private String getObject(ServiceSubtask serviceSubtask, String scriptContent) {
			//内容为空时直接返回，避免下面的replace出现空指针
			if (StringUtils.isEmpty(scriptContent)) {
			return scriptContent;
			}
			Map<String, Map<String, String>> param = getParam(serviceSubtask.getTaskid());
			for (Map<String, String> map : param.values()) {
			for (String key : map.keySet()) {
			scriptContent = scriptContent.replace(key, StringUtils.isNotEmpty(map.get(key)) ? map.get(key) : "");
			}
			}
			if (StringUtils.isEmpty(scriptContent)) {
			return scriptContent;
			}
			scriptContent = scriptContent.replace("${name}", StringUtils.isNotEmpty(serviceSubtask.getSendname()) ? serviceSubtask.getSendname() : "");
			scriptContent = scriptContent.replace("${dzz}", StringUtils.isNotEmpty(serviceSubtask.getAddr()) ? serviceSubtask.getAddr() : "");
			@@ -1869,6 +1884,21 @@
			st.setNexttaskflag("1");
			st.setOrgid(orgid);
			List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);

			// 随访中心科室
			String centerDept = configService.selectConfigByKey("sys.smartor.center.dept", orgid);
			SysDept sysDeptVo = new SysDept();
			SysDept centerSysDept = null;
			if(StringUtils.isNotEmpty(centerDept)){
			sysDeptVo.setDeptType("1");
			sysDeptVo.setOrgid(orgid);
			sysDeptVo.setDeptCode(centerDept);
			List<SysDept> sysDepts = sysDeptService.selectDeptList(sysDeptVo);
			if (CollectionUtils.isNotEmpty(sysDepts)) {
			centerSysDept = sysDepts.get(0);
			}
			}

			for (ServiceTask serviceTask : serviceTasks) {
			deadlineDay = -deadlineDay;
			Date deadline = DateUtils.addDays(new Date(), deadlineDay);
			@@ -1880,6 +1910,7 @@
			serviceSubtaskVO.setVisitCount(1);
			serviceSubtaskVO.setTaskid(serviceTask.getTaskid());
			serviceSubtaskVO.setEndOutHospTime(deadline);

			List<ServiceSubtask> serviceSubtaskList
			= serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
			log.info("【dealSubtaskDeadline】获取到{}个超时任务, taskid={}", serviceSubtaskList.size(), serviceTask.getTaskid());
			@@ -1913,8 +1944,13 @@
			serviceSubtaskAgain.setCreateTime(new Date());
			serviceSubtaskAgain.setUpdateTime(new Date());
			serviceSubtaskAgain.setVisitType(serviceSubtask.getVisitType());
			serviceSubtaskAgain.setVisitDeptCode(serviceSubtask.getVisitDeptCode());
			serviceSubtaskAgain.setVisitDeptName(serviceSubtask.getVisitDeptName());
			if(ObjectUtils.isNotEmpty(centerSysDept)){
			serviceSubtaskAgain.setVisitDeptCode(centerSysDept.getDeptCode());
			serviceSubtaskAgain.setVisitDeptName(centerSysDept.getDeptName());
			}else {
			serviceSubtaskAgain.setVisitDeptCode(serviceSubtask.getVisitDeptCode());
			serviceSubtaskAgain.setVisitDeptName(serviceSubtask.getVisitDeptName());
			}
			int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtaskAgain);
			if (i == 1) {
			//再次随访任务创建成功后，原任务改为失败状态