From d9281d43e27ab6c510d390ddb26eaffc8ccc1add Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:04:52 +0800
Subject: [PATCH] 妇幼-补充住院随访档案生成日志、完成事件及自检文件
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index 19130e6..3b24af5 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -63,6 +63,9 @@
import com.ruoyi.task.service.IServiceSubtaskDetailTraceService;
import com.ruoyi.task.domain.ServiceSubtaskPreachform;
import com.ruoyi.task.service.IServiceTaskService;
+import com.ruoyi.task.mapper.ServiceSubtaskPreachformMapper;
+import com.ruoyi.task.event.FollowupCompletedEventPublisher;
+import com.ruoyi.patarchive.mapper.PatArchiveMapper;
/**
* 浠诲姟闂嵎闂閫夐」Service涓氬姟灞傚鐞�
*
@@ -89,6 +92,9 @@
@Autowired
private ServiceSubtaskMapper serviceSubtaskMapper;
+
+ @Autowired
+ private FollowupCompletedEventPublisher followupCompletedEventPublisher;
@Autowired
private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
@@ -474,6 +480,7 @@
log.error("灏嗚key鍜寁alue浠巖edis涓�,serviceSubtask鐨勫�间负--------锛歿}", serviceSubtask);
serviceSubtask.setScore(formatScore(scoreTotal));
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ followupCompletedEventPublisher.publish(serviceSubtask.getId());
//灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴� 9 瀹屾垚锛堢紦瀛� preachform 鏌ヨ锛�
String currentPreachform = serviceSubtask.getCurrentPreachform();
@@ -516,8 +523,29 @@
}
}
+ /**
+ * 鍚屼竴浠介棶鍗风殑淇濆瓨閿侊細鎸夈�屼换鍔�+鎮ｈ��+瀛愪换鍔°�嶅姞閿侊紝
+ * 鍓嶇閲嶅鐐瑰嚮 / 骞跺彂璇锋眰杩涙潵鏃朵覆琛屾墽琛岋紝閬垮厤鍚屼竴浠介棶鍗疯鍐欎袱閬嶃��
+ * 娉ㄦ剰锛氬彧鏄覆琛屽寲锛屼笉闃绘鍐嶆淇濆瓨鈥斺�旈棶鍗蜂粛鐒跺厑璁镐慨鏀瑰悗鍐嶄繚瀛橈紙璧版洿鏂伴�昏緫锛夈��
+ */
+ private static final java.util.concurrent.ConcurrentHashMap<String, Object> SAVE_LOCKS =
+ new java.util.concurrent.ConcurrentHashMap<>();
+
@Override
public Integer saveQuestionDetail(ServiceSubTaskCacheReq serviceSubTaskCacheReq, Long flag) {
+ String lockKey = serviceSubTaskCacheReq.getParam1() + "_"
+ + serviceSubTaskCacheReq.getParam2() + "_"
+ + serviceSubTaskCacheReq.getParam6();
+ Object lock = SAVE_LOCKS.computeIfAbsent(lockKey, k -> new Object());
+ if (SAVE_LOCKS.size() > 20000) {
+ SAVE_LOCKS.clear();
+ }
+ synchronized (lock) {
+ return doSaveQuestionDetail(serviceSubTaskCacheReq, flag);
+ }
+ }
+
+ private Integer doSaveQuestionDetail(ServiceSubTaskCacheReq serviceSubTaskCacheReq, Long flag) {
Long tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
Long pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
Long subid = Long.valueOf(serviceSubTaskCacheReq.getParam6());
@@ -641,6 +669,7 @@
serviceSubtask.setUpdateTime(new Date());
serviceSubtask.setScore(formatScore(scoreTotal));
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ followupCompletedEventPublisher.publish(serviceSubtask.getId());
//灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴�9瀹屾垚
ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
@@ -800,6 +829,7 @@
serviceSubtask.setVisitTime(new Date());
serviceSubtask.setScore(formatScore(scoreTotal));
serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ followupCompletedEventPublisher.publish(serviceSubtask.getId());
//灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴�9瀹屾垚
ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
serviceSubtaskPreachform.setPreachform(serviceSubtask.getCurrentPreachform());
@@ -920,7 +950,8 @@
Map<String, Object> map = new HashMap<>();
if (serviceSubTaskQueryReq.getSubId() != null) {
ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(serviceSubTaskQueryReq.getSubId());
- if (serviceSubtask.getSendstate() == 4L) {
+ // 浠诲姟鍙兘宸茶鍒犻櫎/鏌ヤ笉鍒帮紝sendstate 涔熷彲鑳戒负绌猴紝杩欓噷蹇呴』鍒ょ┖锛屽惁鍒欐媶绠变細 NPE
+ if (serviceSubtask != null && Long.valueOf(4L).equals(serviceSubtask.getSendstate())) {
log.info("鎮ｈ�呭瓙浠诲姟ID涓猴細{}锛岀姸鎬佷负锛歿}", serviceSubTaskQueryReq.getSubId(), serviceSubtask.getSendstate());
throw new BaseException("璇ヤ换鍔′笉鎵ц");
}
@@ -933,7 +964,7 @@
//鑾峰彇涓婃鐨勯棶绛旂粨鏋�
ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(serviceSubTaskQueryReq.getSubId());
map.put("upScriptResult", null);
- map.put("templateName", serviceSubtask.getTemplatename());
+ map.put("templateName", serviceSubtask == null ? null : serviceSubtask.getTemplatename());
map.put("upTaskName", null);
if (ObjectUtils.isNotEmpty(serviceSubtask) && serviceSubtask.getUpid() != null) {
Map<String, Object> scriptInfoByCondition2 = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom(), serviceSubTaskQueryReq.getSubId());
@@ -951,7 +982,7 @@
private Map<String, Object> getMap(Map<String, Object> scriptInfoByCondition, Long subid, Long patid) {
Map<String, Object> map = new HashMap<>();
if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
- if (scriptInfoByCondition.get("type").equals("1")) {
+ if ("1".equals(scriptInfoByCondition.get("type"))) {
List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOS = (List<IvrTaskTemplateScriptVO>) scriptInfoByCondition.get("script");
// 鎵归噺鏌ヨ鎵�鏈夋槑缁嗭紝閬垮厤寰幆涓�愭潯鏌ユ暟鎹簱锛圢+1闂浼樺寲锛�
Map<Long, ServiceSubtaskDetail> detailMap = getScriptResultMap(subid, patid);
@@ -964,7 +995,7 @@
}
map.put("scriptResult", ivrTaskTemplateScriptVOS);
map.put("taskName", scriptInfoByCondition.get("taskName"));
- } else if (scriptInfoByCondition.get("type").equals("2")) {
+ } else if ("2".equals(scriptInfoByCondition.get("type"))) {
List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
// 鎵归噺鏌ヨ鎵�鏈夋槑缁嗭紝閬垮厤寰幆涓�愭潯鏌ユ暟鎹簱锛圢+1闂浼樺寲锛�
Map<Long, ServiceSubtaskDetail> detailMap = getScriptResultMap(subid, patid);
@@ -980,7 +1011,7 @@
}
map.put("scriptResult", svyTaskTemplateScriptVOList);
map.put("taskName", scriptInfoByCondition.get("taskName"));
- } else if (scriptInfoByCondition.get("type").equals("3")) {
+ } else if ("3".equals(scriptInfoByCondition.get("type"))) {
//瀹ｆ暀涓嶉渶瑕佹煡鐪�
List<HeLibrary> heLibraryList = (List) scriptInfoByCondition.get("script");
map.put("scriptResult", heLibraryList);
@@ -1220,6 +1251,8 @@
//闈炴弧鎰忓害鎰忚寮傚父鑷姩濉叆绌�
subtaskDetailTrace.setMatchedtext(stt != null ? stt.getOptioncontent() : svyTaskTemplateScriptVO.getIsMydException());
subtaskDetailTrace.setAsrtext(stt != null ? stt.getOptioncontent() : svyTaskTemplateScriptVO.getIsMydException());
+ //琛ュ厖鎻忚堪锛堥�変簡"鍏朵粬/鏈夌棁鐘�"鏃跺～鐨勬枃瀛楋級涓�骞跺甫鍒� trace 琛�
+ subtaskDetailTrace.setAnswerps(serviceSubtaskDetail.getAnswerps());
subtaskDetailTrace.setIsMydException(svyTaskTemplateScriptVO.getIsMydException());
subtaskDetailTrace.setRecordpath(null);
@@ -1513,6 +1546,8 @@
subtaskDetailTrace.setType(ivrLibaScriptAssort != null ? ivrLibaScriptAssort.getType() : null);
subtaskDetailTrace.setScriptid(ivrTaskTemplateScriptVO.getId() == null ? ivrTaskTemplateScriptVO.getScriptID() : ivrTaskTemplateScriptVO.getId());
subtaskDetailTrace.setAsrtext(ivrTaskTemplateScriptVO.getIvrtext());
+ //琛ュ厖鎻忚堪涓�骞跺甫鍒� trace 琛�
+ subtaskDetailTrace.setAnswerps(serviceSubtaskDetail.getAnswerps());
subtaskDetailTrace.setRecordpath(null);
subtaskDetailTrace.setPatid(selectServiceSubtaskList.get(0).getPatid());
JSONObject patdescJson2 = new JSONObject();
--
Gitblit v1.9.3