From f0a09ee996ab2605869844d6a3d812709e2bf0fa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 16:07:25 +0800
Subject: [PATCH] 任务模块、电话模块
---
ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceTaskServiceImpl.java | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceTaskServiceImpl.java
similarity index 95%
rename from smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
rename to ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceTaskServiceImpl.java
index a6b5a37..325d1b1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceTaskServiceImpl.java
@@ -1,4 +1,4 @@
-package com.smartor.service.impl;
+package com.ruoyi.task.service.impl;
import java.util.*;
@@ -9,16 +9,12 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
-import com.smartor.domain.entity.ServiceSubtaskEntity;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
-import com.smartor.domain.*;
-import com.smartor.mapper.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.smartor.service.IServiceTaskService;
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.template.domain.HeLibrary;
@@ -43,6 +39,18 @@
import com.ruoyi.template.mapper.SvyTaskTemplateScriptMapper;
import com.ruoyi.template.mapper.SvyTaskTemplateTargetoptionMapper;
import com.ruoyi.template.api.TemplateFacade;
+import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.task.domain.entity.ServiceSubtaskEntity;
+import com.ruoyi.task.domain.ServiceSubtask;
+import com.ruoyi.task.domain.ServiceTask;
+import com.ruoyi.task.domain.ServiceTaskdept;
+import com.ruoyi.task.mapper.ServiceSubtaskMapper;
+import com.ruoyi.task.mapper.ServiceTaskdeptMapper;
+import com.ruoyi.task.mapper.ServiceTaskMapper;
+import com.ruoyi.task.domain.ServiceSubtaskPreachform;
+import com.ruoyi.task.api.spi.TaskPreachformPort;
+import com.ruoyi.task.api.spi.TaskArchivePort;
+import com.ruoyi.task.service.IServiceTaskService;
/**
* 璇煶浠诲姟Service涓氬姟灞傚鐞�
*
@@ -77,9 +85,7 @@
@Autowired
private ServiceTaskdeptMapper serviceTaskdeptMapper;
@Autowired
- private PatArchiveImportMapper patArchiveImportMapper;
- @Autowired
- private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
+ private TaskPreachformPort taskPreachformPort;
@Autowired
private SvyTaskTemplateScriptMapper svyTaskTemplateScriptMapper;
@Autowired
@@ -87,7 +93,7 @@
@Autowired
private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;
@Autowired
- private PatArchiveMapper patArchiveMapper;
+ private TaskArchivePort taskArchivePort;
@Autowired
private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
@Autowired
@@ -297,13 +303,13 @@
serviceSubtaskPreachform.setPreachform(serviceSubtask.getCurrentPreachform());
serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
- List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
+ List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = taskPreachformPort.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
ServiceSubtaskPreachform ssp = serviceSubtaskPreachforms.get(0);
//浜哄伐鏃�-3宸查鍙栫姸鎬�(service_subtask_preachform.sendstate = 3)
if(StringUtils.isNotEmpty(ssp.getPreachform()) && !ssp.getPreachform().equals("1")){
ssp.setSendstate("3");
- serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(ssp);
+ taskPreachformPort.updateServiceSubtaskPreachform(ssp);
}
}
}
@@ -340,19 +346,19 @@
patMedInhospVO.setSerialnum(zyserialnum);
List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospListByCondition(patMedInhospVO);
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
- patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhospList.get(0).getPatid());
+ patArchive = taskArchivePort.findByPatid(patMedInhospList.get(0).getPatid());
}
} else if (StringUtils.isNotEmpty(mzserialnum)) {
PatMedOuthospQueryReq patMedOuthosp = new PatMedOuthospQueryReq();
patMedOuthosp.setSerialnum(mzserialnum);
List<PatMedOuthosp> patMedOuthosps = outhospDataFacade.callSpQueryOuthosp(patMedOuthosp);
if (CollectionUtils.isNotEmpty(patMedOuthosps)) {
- patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosps.get(0).getPatid());
+ patArchive = taskArchivePort.findByPatid(patMedOuthosps.get(0).getPatid());
}
} else if (StringUtils.isNotEmpty(tsserialnum)) {
PatArchive pa = new PatArchive();
pa.setPatientno(tsserialnum);
- List<PatArchive> patArchives = patArchiveMapper.selectPatArchiveList(pa);
+ List<PatArchive> patArchives = taskArchivePort.findList(pa);
if (CollectionUtils.isNotEmpty(patArchives)) patArchive = patArchives.get(0);
}
@@ -431,10 +437,9 @@
//鑾峰彇鎮ｈ�呬俊鎭�
PatArchive patArchive = null;
- if (patfrom.equals("0")) patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
+ if (patfrom.equals("0")) patArchive = taskArchivePort.findByPatid(patid);
else if (patfrom.equals("1")) {
- PatArchiveImport patArchiveImport = patArchiveImportMapper.selectPatArchiveImportById(patid);
- patArchive = DtoConversionUtils.sourceToTarget(patArchiveImport, PatArchive.class);
+ patArchive = taskArchivePort.findImportedByPatid(patid);
}
//閫氳繃鎮ｈ�呬俊鎭拰浠诲姟淇℃伅涓殑textParam瀵归棶棰樹腑鐨勫彉閲忚繘琛屽～鍏�
@@ -523,10 +528,9 @@
}
//鑾峰彇鎮ｈ�呬俊鎭�
PatArchive patArchive = null;
- if (patfrom.equals("0")) patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
+ if (patfrom.equals("0")) patArchive = taskArchivePort.findByPatid(patid);
else if (patfrom.equals("1")) {
- PatArchiveImport patArchiveImport = patArchiveImportMapper.selectPatArchiveImportById(patid);
- patArchive = DtoConversionUtils.sourceToTarget(patArchiveImport, PatArchive.class);
+ patArchive = taskArchivePort.findImportedByPatid(patid);
}
--
Gitblit v1.9.3