smartor.git - Gitblit

			@@ -287,6 +287,17 @@
			}

			/**
			* 每月15号和月底，查询并处理 HIS 数据（同德，南华）
			*/
			public void dealHisDataHalfMonth() {
			LocalDateTime now = LocalDateTime.now();
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			String formattedNow = now.format(formatter);
			dealHisData(formattedNow);
			}


			/**
			* HIS数据采集
			* 定时任务：采集患者信息、出院、门诊数据
			* todayZeroStr 当前的时间例如：2026-05-06 00:00:00
			@@ -423,7 +434,7 @@
			list.add("FH0109.23");
			list.add("FH0109.53");
			serviceSLTDInhospReqVO.setStatusList(list);
			log.info("【dealHisData】省立同德“预入院”采集数据入参：{}", serviceSLTDInhospReqVO);
			// log.info("【dealHisData】省立同德“预入院”采集数据入参：{}", serviceSLTDInhospReqVO);
			serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
			log.info("【dealHisData】省立同德“预入院”結束采集数据，院区：{}", cid);

			@@ -441,7 +452,7 @@
			List<String> listStr = new ArrayList<>();
			listStr.add("FH0109.24");
			serviceSLTDInhospReqVO.setStatusList(listStr);
			log.info("【dealHisData】省立同德“入院”采集数据入参：{}", serviceSLTDInhospReqVO);
			// log.info("【dealHisData】省立同德“入院”采集数据入参：{}", serviceSLTDInhospReqVO);
			serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
			log.info("【dealHisData】省立同德“入院”結束采集数据，院区：{}", cid);

			@@ -464,7 +475,7 @@
			//预出院
			list2.add("FH0109.25");
			serviceSLTDInhospReqVO.setStatusList(list2);
			log.info("【dealHisData】省立同德“出院”采集数据入参：{}", serviceSLTDInhospReqVO);
			// log.info("【dealHisData】省立同德“出院”采集数据入参：{}", serviceSLTDInhospReqVO);
			serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
			log.info("【dealHisData】省立同德“出院”束采集数据，院区：{}", cid);
			}
			@@ -485,7 +496,7 @@
			* @param endDateStr 日期结束 yyyy-MM-dd
			*/
			private void collectSegmentData(Long cid, String startDateStr, String endDateStr) {
			// 预入院
			// // 预入院
			log.info("【dealHisData】预入院开始采集数据，院区：{}，时间段：{} ~ {}", cid, startDateStr, endDateStr);
			ServiceSLTDInhospReqVO reqVO = new ServiceSLTDInhospReqVO();
			reqVO.setOrgId("20001001");
			@@ -847,7 +858,9 @@

			//2判断一下，当前的sort是不是等于需要执行的总个数，如果等于的话，说明是最后一个，直接将servuce_subtask的状态改成5，执行失败就行了
			Long cs = currentSort.get();
			if (cs.equals(serviceSubtaskPreachforms.size())) {

			if (cs.equals(serviceSubtaskPreachforms.size())
			&& isSubtaskDeadline(serviceSubtask, serviceSubtaskPreachforms)) {
			serviceSubtask.setSendstate(7L);
			serviceSubtask.setRemark("处理补偿任务,当前处理最后补偿，全部执行失败（超时）");

			@@ -1362,15 +1375,15 @@
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
			return "-1";
			}

			// 当sort等于列表size时，并且所有sendstate都不等于9，则返回-1
			if (currentSort.get().equals((long) serviceSubtaskPreachforms.size())) {
			if (currentSort.get().equals((long) serviceSubtaskPreachforms.size())
			&& isSubtaskDeadline(serviceSubtask, serviceSubtaskPreachforms)) {
			if (allSendStateNot1AndNot9) {
			//说明全发送失败了
			serviceSubtask.setSendstate(7L);
			serviceSubtask.setFinishtime(null);
			log.error("getSendPreachform方法检查是否所有sendstate不等于9, 全失败了");
			serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + "," + "所有发送方式均未获取结果，任务失败（超时）" : "所有发送方式均未获取结果，任务失败（超时）");
			serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + "," + "所有执行方式均未获取结果，任务失败（超时）" : "所有执行方式均未获取结果，任务失败（超时）");
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
			//修改发送状态
			setFail(serviceSubtaskPreachforms, serviceSubtask);
			@@ -1548,7 +1561,7 @@
			// //人工的未发送状态，需要查2
			// if (preachform.equals("1") && StringUtils.isNotEmpty(failSendstate) && Long.valueOf(failSendstate) > 2)
			// serviceSubtaskPreachform.setSendstate("2");

			log.error("-----serviceSubtaskPreachform的入参是？{}", serviceSubtaskPreachform);
			List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
			if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
			ServiceSubtaskPreachform serviceSubtaskPreachform1 = serviceSubtaskPreachforms.get(0);
			@@ -1561,7 +1574,8 @@
			serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(serviceSubtaskPreachform1);

			//如果当前的preachform已经是最后一个了，那直接将serviceSubtask的sendstate状态改成7就行了(全超时了)
			if (serviceSubtaskPreachform1.getSort() == sspCount.size()) {
			if (serviceSubtaskPreachform1.getSort() == sspCount.size()
			&& isSubtaskDeadline(serviceSubtask, serviceSubtaskPreachforms)) {
			if (failSendstate.equals("4") \|\| failSendstate.equals("5")) {
			serviceSubtask.setCurrentPreachform(preachform);
			serviceSubtask.setSendstate(7L);
			@@ -1678,4 +1692,35 @@
			log.error("【rollTaskGroupCycle】滚动调度异常", e);
			}
			}

			/**
			* 随访任务是否超时
			* @param serviceSubtask
			* @param serviceSubtaskPreachforms
			* @return
			*/
			public boolean isSubtaskDeadline(ServiceSubtask serviceSubtask, List<ServiceSubtaskPreachform> serviceSubtaskPreachforms){
			if (ObjectUtils.isNotEmpty(serviceSubtask)) {
			//只有出院随访和专病随访有超时
			if(StringUtils.isNotEmpty(serviceSubtask.getServiceType()) &&
			!serviceSubtask.getServiceType().equals("2") && !serviceSubtask.getServiceType().equals("13")){
			return true;
			}
			}
			if (Objects.isNull(serviceSubtask) \|\| CollectionUtils.isEmpty(serviceSubtaskPreachforms)) {
			return false;
			}
			// 基准时刻：出院时间 + 发送日（sendDay 缺省按 1），并兜底避免 NPE/脏数据
			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();
			sumCompensateTime = sumCompensateTime + 1;
			// 只补偿最后一步自身的补偿时间（天），脏值一律按 0 兜底
			deadline = DateUtils.addDays(deadline, sumCompensateTime);
			// 出院(发送)时间 + 本步补偿时间小于当前时间 -> 超时
			return deadline.getTime() < new Date().getTime();
			}
			}