From 195190571e567602d5e4e8ae3c7c490a515719ef Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 08 十月 2024 15:43:04 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 baf4338..ce70d11 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -81,6 +81,11 @@
@Override
public List<ServiceTask> selectServiceTaskList(ServiceTask serviceTask) {
+ //濡傛灉涓�0涓嶇疆绌猴紝浼氬奖鍝嶅埌鎴戠殑鏌ヨ
+ if (CollectionUtils.isEmpty(serviceTask.getLeaveldeptcodes()) || serviceTask.getLeaveldeptcodes().size() == 0)
+ serviceTask.setLeaveldeptcodes(null);
+ if (CollectionUtils.isEmpty(serviceTask.getLeavehospitaldistrictcodes()) || serviceTask.getLeavehospitaldistrictcodes().size() == 0)
+ serviceTask.setLeavehospitaldistrictcodes(null);
return serviceTaskMapper.selectServiceTaskList(serviceTask);
}
@@ -142,7 +147,7 @@
}
@Override
- public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid) {
+ public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid, Boolean isFinish) {
Map<String, Object> map = new HashMap<>();
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
serviceSubtaskVO.setPatid(patid);
@@ -164,19 +169,22 @@
info = sfInfo(serviceTask, patid);
} else if (serviceTask.getType().equals("2")) {
//闂嵎
- info = wjInfo(serviceTask, patid);
+ info = wjInfo(serviceTask, patid, isFinish);
} else {
//瀹ｆ暀
- info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid);
+ info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid, isFinish);
}
//鍙鎵撳紑浜嗛〉闈紝灏辩畻鎴愬姛
- ServiceSubtask ServiceTaskSingle = new ServiceSubtask();
- ServiceTaskSingle.setTaskid(taskid);
- ServiceTaskSingle.setPatid(patid);
- ServiceTaskSingle.setResult("success");
- ServiceTaskSingle.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtaskByCondition(ServiceTaskSingle);
+ if (isFinish) {
+ ServiceSubtask ss = new ServiceSubtask();
+ ss.setTaskid(taskid);
+ ss.setPatid(patid);
+ ss.setSendstate(1L);
+ ss.setResult("success");
+ ss.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
+ }
SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(serviceTask.getTemplateid());
if (StringUtils.isNotEmpty(serviceTask.getKcb())) map.put("kcb", serviceTask.getKcb());
map.put("script", info);
@@ -257,7 +265,15 @@
* @param patid
* @return
*/
- private List wjInfo(ServiceTask serviceTask, Long patid) {
+ private List wjInfo(ServiceTask serviceTask, Long patid, Boolean isFinish) {
+ //鐢ㄦ埛鐐瑰嚮浜嗗閾撅紝灏辩畻浠栭鍙栦簡
+ if (isFinish == true) {
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setSendstate(1L);
+ serviceSubtask.setPatid(patid);
+ serviceSubtask.setTaskid(serviceTask.getTaskid());
+ serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
+ }
//閫氳繃妯℃澘ID鑾峰彇闂淇℃伅
SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getLibtemplateid()));
@@ -313,13 +329,15 @@
return svyLibTemplateScriptVOS;
}
- private List xjInfo(Long templateId, Long taskid, Long patid) {
- ServiceSubtask serviceSubtask = new ServiceSubtask();
- serviceSubtask.setTaskid(taskid);
- serviceSubtask.setPatid(patid);
- serviceSubtask.setResult("瀹屾垚");
- serviceSubtask.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ private List xjInfo(Long templateId, Long taskid, Long patid, Boolean isFinish) {
+ if (isFinish == true) {
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setTaskid(taskid);
+ serviceSubtask.setPatid(patid);
+ serviceSubtask.setResult("瀹屾垚");
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ }
HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
List list = new ArrayList();
list.add(heLibrary);
--
Gitblit v1.9.3