smartor.git - Gitblit

			@@ -337,7 +337,6 @@
			serviceSLTDInhospReqVO.setStartHeadTime(nowTime);
			serviceSLTDInhospReqVO.setStartTailTime(nowTime);
			List<String> listStr = new ArrayList<>();
			// list.add("FH0108.02");
			listStr.add("FH0109.26");
			serviceSLTDInhospReqVO.setStatusList(listStr);
			log.debug("【dealHisData】省立同德“入院”采集数据入参：{}", serviceSLTDInhospReqVO);
			@@ -374,9 +373,6 @@
			serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
			log.debug("【dealHisData】省立同德“出院”束采集数据，院区：{}", cid);
			}
			// SysConfig sysConfig = sysConfigs.get(0);
			// sysConfig.setConfigValue(nowTime);
			// configService.updateConfig(sysConfig);
			} catch (Exception e) {
			log.error("【dealHisData】省立同德数据采集异常", e);
			}
			@@ -597,7 +593,8 @@
			redisCache.setCacheListLeftAndDistinct("cache-0", list);
			log.info("【sfHandlle】电话任务已加入队列，数量：{}", list.size());
			}
			} else if (descByCode.equals("微信小程序")) {
			}
			else if (descByCode.equals("微信小程序")) {
			//微信小程序
			if (ObjectUtils.isNotEmpty(ivrTask1) && ivrTask1.getPatCycle() == 1) {
			//说明该任务的患者是循环执行的
			@@ -624,7 +621,8 @@
			//将当前要执行的患者放到过滤患者集合中
			serviceSubtaskListFilter.add(serviceSubtask);
			}
			} else if (descByCode.equals("短信")) {
			}
			else if (descByCode.equals("短信")) {
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
			log.info("【sfHandlle】处理短信长期任务，患者ID：{}", serviceSubtask.getPatid());
			@@ -656,6 +654,9 @@
			if (serviceSubtask.getType().equals("1"))
			sendMagParam.setUrl(localIP + ":" + req_path + "/sf?p=" + format);
			sendMagParam.setContent("您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
			if (active.equals("xh")) {
			sendMagParam.setContent("【新华医院】您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
			}
			} else {
			HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid());
			if (heLibrary.getHetype().equals("1")) {
			@@ -669,7 +670,9 @@
			} else if (heLibrary.getHetype().equals("2")) {
			//通知
			sendMagParam.setPhone(serviceSubtask.getPhone());
			sendMagParam.setContent(heLibrary.getPreachcontent());
			// 替换文本内容中的变量
			String content = getObject(serviceSubtask, heLibrary.getPreachcontent());
			sendMagParam.setContent(content);
			}

			}
			@@ -752,7 +755,7 @@
			setSuccessPreachForm(serviceSubtask, sendPreachform, "短信发送成功", "2");
			} else {
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark(serviceSubtask.getRemark() + "," +"短信发送失败" + now);
			serviceSubtask.setRemark(serviceSubtask.getRemark() + "," + "短信发送失败" + now);
			setSuccessPreachForm(serviceSubtask, sendPreachform, "短信发送失败" + now, "5");
			}
			} catch (Exception e) {
			@@ -885,6 +888,17 @@
			Optional<Long> currentSort = serviceSubtaskPreachforms.stream().filter(item -> serviceSubtask.getCurrentPreachform().equals(item.getPreachform())).map(ServiceSubtaskPreachform::getSort).findFirst();

			if (currentSort.isPresent()) {
			//微信已发送、已领取视为发送成功，不再进行补偿 -丽水中医院
			if(active.equals("47231022633110211A2101")){
			//获取当前发送方式
			ServiceSubtaskPreachform currentServiceSubtaskPreachform = serviceSubtaskPreachforms.stream().filter(item -> item.getSort().equals(currentSort.get())).findFirst().orElse(new ServiceSubtaskPreachform());
			if(currentServiceSubtaskPreachform.getPreachform().equals("5")
			&& (currentServiceSubtaskPreachform.getSendstate().equals("2")
			\|\| currentServiceSubtaskPreachform.getSendstate().equals("3"))){
			return "-1";
			}
			}

			// 检查是否所有sendstate不等于9
			boolean allSendStateNot1AndNot9 = serviceSubtaskPreachforms.stream().allMatch(item -> !item.getSendstate().equals("9"));
			if (!allSendStateNot1AndNot9) {
			@@ -1055,7 +1069,6 @@
			return true;
			}


			ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
			serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
			serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
			@@ -1109,4 +1122,47 @@
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
			return true;
			}

			/**
			* 通配符变量替换
			*
			* @param serviceSubtask
			* @param scriptContent
			* @return
			*/
			private String getObject(ServiceSubtask serviceSubtask, String 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() : "");
			scriptContent = scriptContent.replace("${phone}", StringUtils.isNotEmpty(serviceSubtask.getTelcode()) ? serviceSubtask.getTelcode() : "");

			return scriptContent;
			}

			/**
			* 获取任务里的通配符
			*
			* @param taskId
			* @return
			*/
			private Map<String, Map<String, String>> getParam(Long taskId) {
			ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(taskId);
			ObjectMapper objectMapper = new ObjectMapper();
			Map<String, Map<String, String>> serviceTaskMap = null;
			try {
			serviceTaskMap = objectMapper.readValue(serviceTask.getTextParam(), Map.class);
			} catch (JsonProcessingException e) {
			e.printStackTrace();
			}
			return serviceTaskMap;
			}

			}