smartor.git - Gitblit

			@@ -913,7 +913,7 @@
			serviceOutPath.setSubId(serviceSubtask1.getId());
			List<ServiceOutPath> serviceOutPaths = serviceOutPathMapper.selectServiceOutPathList(serviceOutPath);
			if (CollectionUtils.isNotEmpty(serviceOutPaths))
			format = String.format("%03X", serviceOutPaths.get(0).getId());
			format = ShortCode.encode(serviceOutPaths.get(0).getId());
			else format = getOutPath(serviceSubtask1, rsaPublicKeyExample);
			serviceSubtask = serviceSubtask1;
			} else {
			@@ -965,7 +965,7 @@
			serviceOutPath.setSubId(serviceSubtask.getId());
			iServiceOutPathService.insertServiceOutPath(serviceOutPath);
			//转成16进制
			format = String.format("%03X", serviceOutPath.getId());
			format = ShortCode.encode(serviceOutPath.getId());
			serviceOutPath.setRadix(format);
			serviceOutPath.setUpdateTime(new Date());
			iServiceOutPathService.updateServiceOutPath(serviceOutPath);
			@@ -2459,7 +2459,10 @@
			if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
			groupKey = drcode;
			} else {
			groupKey = "deptcode";
			// 2026-11 字段重命名后：deptcode 是在院科室（历史数据为空），
			// 出院科室已改名为 leaveldeptcode，分组必须用后者，
			// 否则 getSfStatisticsGroupKey 会返回 NULL，拼成 IN (NULL) 导致整表查空。
			groupKey = "leaveldeptcode";
			}
			} else if (serviceSubtaskCountReq.getStatisticaltype() != null && serviceSubtaskCountReq.getStatisticaltype() == 3) {
			// 病种统计：按任务ID分组，每个任务即一个病种随访任务
			@@ -2470,6 +2473,17 @@
			Map<String, List<ServiceSubtask>> collect = new HashMap<>();
			serviceSubtaskCountReq.setGroupKey(groupKey);
			List<String> groupKeyList = serviceSubtaskMapper.getSfStatisticsGroupKey(serviceSubtaskCountReq);
			/*
			* 分组键可能为 NULL（历史数据、或重命名后尚未回填的在院维度列），
			* 直接拼进 SQL 会变成 `AND IFNULL(列,'Unknown') IN (NULL)`，恒不成立，整张统计表为空。
			* 这里统一成 'Unknown'，与聚合 SQL 的 IFNULL(列,'Unknown') 口径对齐。
			*/
			if (groupKeyList != null) {
			groupKeyList = groupKeyList.stream()
			.map(key -> key == null ? "Unknown" : key)
			.distinct()
			.collect(Collectors.toList());
			}
			serviceSubtaskCountReq.setGroupKeyList(groupKeyList);
			List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
			switch (groupKey) {
			@@ -2484,6 +2498,7 @@
			collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getManagementDoctorCode()).orElse("Unknown")));
			break;
			case "deptcode":
			case "leaveldeptcode":
			collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeaveldeptcode()).orElse("Unknown")));
			break;
			case "leavehospitaldistrictcode":
			@@ -3100,7 +3115,7 @@
			}

			/**
			* 再次随访附加统计：待随访、已发送、人工电话超时及回院复诊复查（suggest=6）。
			* 再次随访附加统计：待随访、已发送、人工电话超时及回院复诊复查（suggest=7）。
			*/
			private void applyAgainFollowUpExtraStatistics(ServiceSubtaskStatistic statistic, ServiceSubtask serviceSubtask) {
			if (serviceSubtask.getVisitCount() == null \|\| serviceSubtask.getVisitCount() <= 1) {
			@@ -3110,9 +3125,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);
			@@ -3758,7 +3773,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
			*
			*/
			@@ -3943,10 +3958,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);
			@@ -4505,7 +4520,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);
			@@ -4550,7 +4565,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));
			@@ -5128,7 +5143,7 @@
			serviceOutPath.setCreateTime(new Date());
			serviceOutPath.setOrgid(serviceSubtask.getOrgid());
			iServiceOutPathService.insertServiceOutPath(serviceOutPath);
			String format = String.format("%03X", serviceOutPath.getId());
			String format = ShortCode.encode(serviceOutPath.getId());
			String url = "";
			SendMagParam sendMagParam = new SendMagParam();
			sendMagParam.setType("4");
			@@ -5212,7 +5227,7 @@
			serviceOutPath.setCreateTime(new Date());
			serviceOutPath.setOrgid(serviceSubtask.getOrgid());
			iServiceOutPathService.insertServiceOutPath(serviceOutPath);
			String format = String.format("%03X", serviceOutPath.getId());
			String format = ShortCode.encode(serviceOutPath.getId());
			serviceOutPath.setRadix(format);
			serviceOutPath.setUpdateTime(new Date());
			serviceOutPath.setUrl(url);
			@@ -5427,7 +5442,7 @@
			serviceOutPath.setCreateTime(new Date());
			serviceOutPath.setOrgid(serviceTask.getOrgid());
			iServiceOutPathService.insertServiceOutPath(serviceOutPath);
			String format = String.format("%03X", serviceOutPath.getId());
			String format = ShortCode.encode(serviceOutPath.getId());
			serviceOutPath.setRadix(format);
			serviceOutPath.setUpdateTime(new Date());
			String url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format;