From a1e256f64930865ae2d170e333ee3f1a773c6c49 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 11:04:29 +0800
Subject: [PATCH] 出入院模块、门急诊模块、模块模块、宣教模块
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index ee42da1..a6b5a37 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.core.service.TemplateModuleDisabledException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
@@ -20,6 +21,28 @@
import com.smartor.service.IServiceTaskService;
import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.template.domain.HeLibrary;
+import com.ruoyi.inhospvisit.domain.PatMedInhosp;
+import com.ruoyi.inhospvisit.domain.PatMedInhospVO;
+import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
+import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq;
+import com.ruoyi.inhospvisit.api.InhospVisitFacade;
+import com.ruoyi.outpatientvisit.api.OuthospDataFacade;
+import com.ruoyi.template.domain.IvrTaskTemplateScript;
+import com.ruoyi.template.domain.IvrTaskTemplateScriptVO;
+import com.ruoyi.template.domain.IvrTaskTemplateTargetoption;
+import com.ruoyi.template.mapper.IvrTaskTemplateScriptMapper;
+import com.ruoyi.template.mapper.IvrTaskTemplateTargetoptionMapper;
+import com.ruoyi.template.domain.SvyLibTemplateScript;
+import com.ruoyi.template.domain.SvyLibTemplateTargetoption;
+import com.ruoyi.template.domain.SvyTaskTemplateScript;
+import com.ruoyi.template.domain.SvyTaskTemplateScriptVO;
+import com.ruoyi.template.domain.SvyTaskTemplateTargetoption;
+import com.ruoyi.template.mapper.SvyLibTemplateScriptMapper;
+import com.ruoyi.template.mapper.SvyLibTemplateTargetoptionMapper;
+import com.ruoyi.template.mapper.SvyTaskTemplateScriptMapper;
+import com.ruoyi.template.mapper.SvyTaskTemplateTargetoptionMapper;
+import com.ruoyi.template.api.TemplateFacade;
/**
* 璇煶浠诲姟Service涓氬姟灞傚鐞�
*
@@ -31,6 +54,24 @@
public class ServiceTaskServiceImpl implements IServiceTaskService {
@Autowired
private ServiceTaskMapper serviceTaskMapper;
+
+ /**
+ * 妯℃澘鏁版嵁涓�寰嬬粡 ruoyi-template 鐨勯棬闈㈠彇鐢紙璺ㄦā鍧楁暟鎹闂師鍒欙級銆�
+ */
+ @Autowired
+ private TemplateFacade templateFacade;
+
+ /**
+ * 璺ㄦā鍧楄闂竴寰嬬粡妯″潡闂ㄩ潰锛堢姝㈢洿杩炲凡鎼蛋鐨� Mapper锛夈��
+ */
+ @Autowired
+ private OuthospDataFacade outhospDataFacade;
+
+ /**
+ * 璺ㄦā鍧楄闂竴寰嬬粡妯″潡闂ㄩ潰锛堢姝㈢洿杩炲凡鎼蛋鐨� Mapper锛夈��
+ */
+ @Autowired
+ private InhospVisitFacade inhospVisitFacade;
@Autowired
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
@@ -40,8 +81,6 @@
@Autowired
private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
@Autowired
- private HeLibraryMapper heLibraryMapper;
- @Autowired
private SvyTaskTemplateScriptMapper svyTaskTemplateScriptMapper;
@Autowired
private IvrTaskTemplateScriptMapper ivrTaskTemplateScriptMapper;
@@ -49,10 +88,6 @@
private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;
@Autowired
private PatArchiveMapper patArchiveMapper;
- @Autowired
- private PatMedInhospMapper patMedInhospMapper;
- @Autowired
- private PatMedOuthospMapper patMedOuthospMapper;
@Autowired
private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
@Autowired
@@ -303,14 +338,14 @@
if (StringUtils.isNotEmpty(zyserialnum)) {
PatMedInhospVO patMedInhospVO = new PatMedInhospVO();
patMedInhospVO.setSerialnum(zyserialnum);
- List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospListByCondition(patMedInhospVO);
+ List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospListByCondition(patMedInhospVO);
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhospList.get(0).getPatid());
}
} else if (StringUtils.isNotEmpty(mzserialnum)) {
PatMedOuthospQueryReq patMedOuthosp = new PatMedOuthospQueryReq();
patMedOuthosp.setSerialnum(mzserialnum);
- List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(patMedOuthosp);
+ List<PatMedOuthosp> patMedOuthosps = outhospDataFacade.callSpQueryOuthosp(patMedOuthosp);
if (CollectionUtils.isNotEmpty(patMedOuthosps)) {
patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosps.get(0).getPatid());
}
@@ -619,7 +654,18 @@
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
}
}
- HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
+ HeLibrary heLibrary;
+ try {
+ heLibrary = templateFacade.findHeLibraryById(Long.valueOf(templateId));
+ } catch (TemplateModuleDisabledException e) {
+ // 妯℃澘妯″潡琚叧闂紙sys_config: template.enabled=false锛夛細
+ // 杩欓噷闄嶇骇涓虹┖鍒楄〃锛岃��**涓嶆槸**璁╁紓甯稿啋鍑哄幓 鈥斺��
+ // 鎮ｈ�呮墦寮�鐨勫鏁欓〉闈㈢収甯稿彲鐪嬨�佸彲鎻愪氦锛�"鍙鎵撳紑浜嗛〉闈㈠氨绠楁垚鍔�"鐨勫悗缁姸鎬佹洿鏂扮収鏃ф墽琛岋級銆�
+ // 鍘熷疄鐜板湪妯℃澘鏌ヤ笉鍒版椂杩斿洖鐨勪篃鏄� [null]锛屽墠绔湰灏辫兘瀹归敊锛涚┖鍒楄〃鏇村共鍑�銆�
+ log.warn("銆愭ā鏉裤�戝鏁欎换鍔″彇妯℃澘琚嫆锛堟ā鍧楀凡鍏抽棴锛夛紝taskid={}, templateId={}锛屾湰娆¤繑鍥炵┖鍐呭",
+ taskid, templateId);
+ return new ArrayList();
+ }
List list = new ArrayList();
list.add(heLibrary);
return list;
--
Gitblit v1.9.3