smartor.git - Gitblit

			@@ -276,6 +276,8 @@
			public Integer saveQuestionAnswer(ServiceSubTaskAnswerReq serviceSubTaskAnswerReq, Long flag) {
			String threadName = Thread.currentThread().getName();
			log.info("[{}] 开始异步处理保存问卷答案", threadName);
			// 幂等占位键：失败时要释放，允许患者重试
			String idemKey = null;
			try {
			//参数解密
			Long tid = null;
			@@ -299,6 +301,17 @@
			//根据 PID、TID、SUBID 构建需要处理的 cache key
			String scriptCacheKeyPrefix = pid + "-" + tid + "-" + subid;
			Set<String> targetKeys = new HashSet<>();

			// ---------------- 幂等：同一份问卷 60 秒内只处理一次 ----------------
			// 本方法是 @Async 异步执行，患者端重复点击/网络重试会让它并发跑多次，
			// 每次都会 upsert 一遍明细；并发时彼此看不到对方还没提交的行 -> 插入重复副本
			// （nhfy 2026-09-08 就是这样堆出 2~6 份，并且把 del_flag 一起写坏）。
			idemKey = "subtaskAnswer:submit:" + scriptCacheKeyPrefix + ":"
			+ (serviceSubTaskAnswerReq == null \|\| serviceSubTaskAnswerReq.getType() == null ? "all" : serviceSubTaskAnswerReq.getType());
			if (!redisCache.setCacheObjectIfAbsent(idemKey, "1", 60, TimeUnit.SECONDS)) {
			log.warn("[{}] 检测到重复提交，本次忽略：{}", threadName, idemKey);
			return 0;
			}

			if (serviceSubTaskAnswerReq != null && serviceSubTaskAnswerReq.getType() != null) {
			if (serviceSubTaskAnswerReq.getType() == 2) {
			@@ -491,6 +504,14 @@
			return 1;
			} catch (Exception e) {
			log.error("[{}] 异步处理保存问卷答案发生异常 : {},请求的对象为：{}", Thread.currentThread().getName(), e.getMessage(), e, serviceSubTaskAnswerReq);
			// 处理失败时释放幂等键，允许患者重新提交
			if (idemKey != null) {
			try {
			redisCache.deleteObject(idemKey);
			} catch (Exception ignore) {
			log.warn("[{}] 释放幂等键失败：{}", Thread.currentThread().getName(), idemKey);
			}
			}
			throw new RuntimeException("保存问卷答案失败", e);
			}
			}
			@@ -728,8 +749,8 @@
			serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
			if (CollectionUtils.isNotEmpty(patMedInhospList)) {
			serviceSubtask.setHospType("2");
			serviceSubtask.setDeptname(patMedInhospList.get(0).getDeptname());
			serviceSubtask.setDeptcode(patMedInhospList.get(0).getDeptcode());
			serviceSubtask.setLeaveldeptname(patMedInhospList.get(0).getDeptname());
			serviceSubtask.setLeaveldeptcode(patMedInhospList.get(0).getDeptcode());
			serviceSubtask.setLeavehospitaldistrictcode(patMedInhospList.get(0).getLeavehospitaldistrictcode());
			serviceSubtask.setLeavehospitaldistrictname(patMedInhospList.get(0).getLeavehospitaldistrictname());
			serviceSubtask.setDrname(patMedInhospList.get(0).getDrname());
			@@ -743,8 +764,8 @@
			serviceSubtask.setHospType("1");
			serviceSubtask.setAdmindate(patMedOuthosps.get(0).getAdmitdate());
			serviceSubtask.setHospno(patMedOuthosps.get(0).getOuthospno());
			serviceSubtask.setDeptname(patMedOuthosps.get(0).getDeptname());
			serviceSubtask.setDeptcode(patMedOuthosps.get(0).getDeptcode());
			serviceSubtask.setLeaveldeptname(patMedOuthosps.get(0).getDeptname());
			serviceSubtask.setLeaveldeptcode(patMedOuthosps.get(0).getDeptcode());
			serviceSubtask.setDrname(patMedOuthosps.get(0).getDrname());
			serviceSubtask.setDrcode(patMedOuthosps.get(0).getDrcode());
			serviceSubtask.setCampusid(patMedOuthosps.get(0).getCampusid());
			@@ -766,7 +787,7 @@
			}
			if (StringUtils.isNotEmpty(dealDept)) {
			//投诉建议的处理部门
			serviceSubtask.setDeptcode(dealDept);
			serviceSubtask.setLeaveldeptcode(dealDept);
			serviceSubtask.setServiceType("15");
			}
			serviceSubtask.setSubmit(1L);
			@@ -1025,6 +1046,11 @@

			/**
			* 批量查询已存在的明细记录ID，按scriptid分组（避免循环中逐条查询）
			* <p>
			* ⚠️ 2026-10-21：<b>不再过滤 del_flag</b>，同一 scriptid 取 id 最大（最新）的那一行。
			* 原来只认 del_flag=0，明细被逻辑删除后就查不到 → 下一次保存必然 INSERT 新副本，
			* 同一患者同一题会堆出 2~6 条重复明细（nhfy 2026-09-08）。
			* 命中被删副本时由调用方再调 {@code reviveServiceSubtaskDetail} 置回 '0'。
			*/
			private Map<Long, Long> getExistingDetailIdMap(Long subid) {
			if (subid == null) return Collections.emptyMap();
			@@ -1034,7 +1060,9 @@
			if (CollectionUtils.isEmpty(details)) return Collections.emptyMap();
			Map<Long, Long> map = new HashMap<>();
			for (ServiceSubtaskDetail d : details) {
			if ((d.getDelFlag() == null \|\| "0".equals(d.getDelFlag())) && d.getScriptid() != null && !map.containsKey(d.getScriptid())) {
			if (d.getScriptid() == null \|\| d.getId() == null) continue;
			Long existId = map.get(d.getScriptid());
			if (existId == null \|\| d.getId() > existId) {
			map.put(d.getScriptid(), d.getId());
			}
			}
			@@ -1131,6 +1159,8 @@
			serviceSubtaskDetail.setId(existDetailId);
			serviceSubtaskDetail.setUpdateTime(new Date());
			serviceSubtaskDetailMapper.updateServiceSubtaskDetail(serviceSubtaskDetail);
			//命中历史被逻辑删除的副本时置回 del_flag='0'（否则答案写进去了却查不到，且下次又会新增副本）
			serviceSubtaskDetailMapper.reviveServiceSubtaskDetail(existDetailId);
			} else {
			serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
			}
			@@ -1430,6 +1460,8 @@
			serviceSubtaskDetail.setId(existServiceSubtaskDetail.getId());
			serviceSubtaskDetail.setUpdateTime(new Date());
			serviceSubtaskDetailMapper.updateServiceSubtaskDetail(serviceSubtaskDetail);
			//命中历史被逻辑删除的副本时置回 del_flag='0'，避免重复副本
			serviceSubtaskDetailMapper.reviveServiceSubtaskDetail(existServiceSubtaskDetail.getId());
			} else {
			serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
			}