smartor.git - Gitblit

			@@ -14,6 +14,7 @@
			import com.ruoyi.common.enums.ServiceFromEnum;
			import com.ruoyi.common.utils.*;
			import com.ruoyi.common.utils.http.HttpUtils;
			import com.ruoyi.common.utils.sms.SmsUtils;
			import com.ruoyi.message.SendResult;
			import com.ruoyi.message.sms.SmsSendRequest;
			import com.ruoyi.message.sms.SmsSenderFactory;
			@@ -39,6 +40,7 @@
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.collections4.CollectionUtils;
			import org.apache.commons.lang3.ObjectUtils;
			import org.apache.commons.lang3.math.NumberUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Component;
			@@ -1149,6 +1151,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());
			@@ -1217,6 +1226,24 @@
			LocalDate today = LocalDate.now();
			// 如果日期早于或等于今天，返回 true
			return !localDate.isAfter(today);
			}

			/**
			* 按机构查询配置值（同一 key 在不同机构下可配置不同值）
			*
			* @param configKey 配置key
			* @param orgid 机构ID
			* @return 配置值，未配置返回 null
			*/
			private String getConfigValue(String configKey, String orgid) {
			SysConfig query = new SysConfig();
			query.setConfigKey(configKey);
			query.setOrgid(orgid);
			List<SysConfig> sysConfigs = configService.selectConfigList(query);
			if (CollectionUtils.isNotEmpty(sysConfigs)) {
			return sysConfigs.get(0).getConfigValue();
			}
			return null;
			}

			/**
			@@ -1374,7 +1401,7 @@
			sysConfig = sysConfigMapper.checkConfigKeyUnique("wj.sms.template");
			}
			log.info("sysConfig的值为：{}", sysConfig);
			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()));
			@@ -1394,7 +1421,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()));
			@@ -1410,6 +1437,13 @@

			}

			//内容为空说明短信模板未配置或宣教/通知内容为空，直接按发送失败处理，避免后续发送时出现空指针
			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);
			serviceOutPath.setUpdateTime(new Date());
			serviceOutPath.setUrl(url);
			@@ -1417,9 +1451,24 @@
			//短信发送：各站点对接方式差异较大（报文/签名/token/返回判定都不同），
			//已收口到 ruoyi-message 模块，这里只负责组装入参并路由
			log.info("active的值为：{}", active);
			String isSuccess = "";
			if ("ls".equals(active) && "47226079133110211G1001".equals(serviceSubtask.getOrgid())) {
			//丽水妇幼走中国移动云MAS，不依赖 ls.msg.info 与 token；
			//ruoyi-message 的 ls 通道尚未覆盖云MAS，故此处保留 SmsUtils 直连
			SmsUtils.YunMasConfig yunMasConfig = SmsUtils.YunMasConfig.of(getConfigValue("ls.msg.yunmas", serviceSubtask.getOrgid()));
			SmsUtils.SmsResult yunMasSmsResult = SmsUtils.sendYunMasSms(yunMasConfig, sendMagParam.getPhone(), sendMagParam.getContent());
			log.info("【sfHandlle】云MAS短信发送结果：ok={}，rspcod={}，msgGroup={}，message={}",
			yunMasSmsResult.isOk(), yunMasSmsResult.getRspcod(), yunMasSmsResult.getMsgGroup(), yunMasSmsResult.getMessage());
			isSuccess = yunMasSmsResult.isOk() ? "true" : "false";
			if (!yunMasSmsResult.isOk()) {
			log.error("【sfHandlle】云MAS短信发送失败，subid：{}，手机号：{}，原因：{}",
			serviceSubtask.getId(), sendMagParam.getPhone(), yunMasSmsResult.getMessage());
			}
			} else {
			SendResult smsSendResult = sendSmsByActive(serviceSubtask, sendMagParam);
			log.info("smsSendResult的值为：{}", smsSendResult);
			String isSuccess = smsSendResult.asLegacyFlag();
			isSuccess = smsSendResult.asLegacyFlag();
			}
			//任务发送记录
			ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
			serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
			@@ -1487,6 +1536,7 @@
			//任务发送记录
			ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
			serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
			serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
			serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
			serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
			serviceSubtaskRecord.setPreachform("4");
			@@ -1854,14 +1904,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() : "");
			@@ -1963,10 +2014,16 @@
			return false;
			}
			// 基准时刻：出院时间 + 发送日（sendDay 缺省按 1），并兜底避免 NPE/脏数据
			if (serviceSubtask.getEndtime() == null) {
			log.warn("【isSubtaskDeadline】subid：{} endtime为空，无法计算超时，按未超时处理", serviceSubtask.getId());
			return false;
			}
			ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
			int sendDay = serviceTask != null && serviceTask.getSendDay() != null ? serviceTask.getSendDay().intValue() : 1;
			Date deadline = DateUtils.addDays(serviceSubtask.getEndtime(), sendDay);
			int sumCompensateTime = CollectionUtils.isEmpty(serviceSubtaskPreachforms) ? 0 : serviceSubtaskPreachforms.stream().mapToInt(x -> x.getCompensateTime() == null ? 0 : Integer.parseInt(x.getCompensateTime())).sum();
			int sumCompensateTime = CollectionUtils.isEmpty(serviceSubtaskPreachforms) ? 0 : serviceSubtaskPreachforms.stream()
			.mapToInt(x -> NumberUtils.toInt(x.getCompensateTime(), 0))
			.sum();
			sumCompensateTime = sumCompensateTime + 1;
			// 只补偿最后一步自身的补偿时间（天），脏值一律按 0 兜底
			deadline = DateUtils.addDays(deadline, sumCompensateTime);
			@@ -1977,16 +2034,24 @@
			/**
			* 处理超时随访任务（随访超时 → 生成"再次随访"）
			* <p>
			* 扫描「出院满 deadlineDay 天仍未完成」的首次随访任务（sendstate=7 + visit_count=1），
			* 按当前任务的 nexttaskid 生成再次随访任务，科室固定为随访中心科室。
			* <p>
			* 注意：截止时间必须在循环外计算一次。历史实现把 {@code deadlineDay = -deadlineDay}
			* 写在循环体内，每轮取反一次，导致偶数轮用「今天 + deadlineDay」做截止时间，
			* 把出院不满 28 天的超时任务也扫了进来。
			* <p>
			* ⚠️ 2025 修复（开关失效）：本方法原不判任何模块开关 ——
			* 关掉 {@code inhospvisit.enabled} 照样建"再次随访"子任务。
			* <p>
			* <b>为什么这里是"入口判开关"而不是像 {@link #dealOutHospInfo()} 那样切到门面</b>：
			* 模块侧只提供了 {@code InhospVisitApi#buildAgainVisitDraft}（组装草稿），
			* <b>没有</b>完整的"扫描超时 → 落库 → 回写原任务状态"入口，
			* 而本方法自己组装并 insert（见下方 {@code insertServiceSubtask}）。
			* 造一个模块入口属于新增能力、超出"只解决开关"的范围，所以取最小改动：入口守卫。
			* 超时扫描与回写原任务状态的入口由 service 侧承接（见下方 {@code addSubTaskAgainByDeadline}）。
			* <p>
			* ⚠️ 全仓只有 {@code ServiceSubtaskController#dealSubtaskDeadline} 一个调用者。
			*
			* @param orgid 机构ID
			* @param deadlineDay 出院满多少天算超时（正数，如 28）
			*/
			public void dealSubtaskDeadline(String orgid, Integer deadlineDay) {
			// ⚠️ 开关守卫：先判再干活，与 dealOutHospInfo / rollTaskGroupCycle 同口径。
			@@ -2002,9 +2067,17 @@
			st.setNexttaskflag("1");
			st.setOrgid(orgid);
			List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);

			// 截止时间只算一次：出院时间 <= 今天 - deadlineDay
			int days = Math.abs(ObjectUtils.isEmpty(deadlineDay) ? 28 : deadlineDay);
			Date deadline = DateUtils.addDays(new Date(), -days);
			log.info("【dealSubtaskDeadline】开始扫描, orgid={}, day={}, deadline={}, 任务数={}",
			orgid, days, deadline, serviceTasks.size());

			for (ServiceTask serviceTask : serviceTasks) {
			deadlineDay = -deadlineDay;
			Date deadline = DateUtils.addDays(new Date(), deadlineDay);
			if (ObjectUtils.isEmpty(serviceTask.getNexttaskid())) {
			continue;
			}
			//通过任务ID拿到患者信息,并且随访时间得是今天之前的
			ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
			serviceSubtaskVO.setOrgid(orgid);
			@@ -2013,44 +2086,19 @@
			serviceSubtaskVO.setVisitCount(1);
			serviceSubtaskVO.setTaskid(serviceTask.getTaskid());
			serviceSubtaskVO.setEndOutHospTime(deadline);
			List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
			List<ServiceSubtask> serviceSubtaskList
			= serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
			log.info("【dealSubtaskDeadline】获取到{}个超时任务, taskid={}", serviceSubtaskList.size(), serviceTask.getTaskid());
			for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
			PatMedInhosp patMedInhospVo = new PatMedInhosp();
			patMedInhospVo.setOrgid(serviceSubtask.getOrgid());
			patMedInhospVo.setInhospid(serviceSubtask.getInhospid());
			patMedInhospVo.setCry(1);
			List<PatMedInhosp> patMedInhospList = iPatMedInhospService.selectPatMedInhospList(patMedInhospVo);
			PatMedInhosp patMedInhosp = new PatMedInhosp();
			if (!patMedInhospList.isEmpty()) {
			patMedInhosp = patMedInhospList.get(0);
			} else {
			continue;
			}
			if (ObjectUtils.isEmpty(serviceTask.getNexttaskid())) {
			continue;
			}
			ServiceTask nextServiceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceTask.getNexttaskid());
			PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask.getPatid());
			String config = configService.selectConfigByKey("visit.early.day");
			Integer type = 1;

			//新增再次随访任务
			ServiceSubtask serviceSubtaskAgain = iPatMedInhospService.boxedServiceSubtask(nextServiceTask, patMedInhosp, patArchive, config, type);
			serviceSubtaskAgain.setId(null);
			serviceSubtaskAgain.setUpid(serviceSubtask.getId().intValue());
			serviceSubtaskAgain.setVisitCount(serviceSubtask.getVisitCount() + 1);
			serviceSubtaskAgain.setSendstate(2L);
			serviceSubtaskAgain.setCreateTime(new Date());
			serviceSubtaskAgain.setUpdateTime(new Date());
			serviceSubtaskAgain.setVisitType(serviceSubtask.getVisitType());
			serviceSubtaskAgain.setVisitDeptCode(serviceSubtask.getVisitDeptCode());
			serviceSubtaskAgain.setVisitDeptName(serviceSubtask.getVisitDeptName());
			int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtaskAgain);
			if (i == 1) {
			//再次随访任务创建成功后，原任务改为失败状态
			serviceSubtask.setSendstate(5L);
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
			try {
			// 生成逻辑统一收口到 service：锁 + 幂等 + 事务 + 发送方式明细初始化
			String result = iServiceSubtaskService.addSubTaskAgainByDeadline(serviceSubtask);
			log.info("【dealSubtaskDeadline】生成再次随访, subId={}, taskid={}, 结果={}",
			serviceSubtask.getId(), serviceTask.getTaskid(), result);
			} catch (Exception e) {
			// 单条失败不影响其他患者
			log.error("【dealSubtaskDeadline】生成再次随访失败, subId=" + serviceSubtask.getId()
			+ ", taskid=" + serviceTask.getTaskid(), e);
			}
			}
			}