From fc4fb24b367f6f0da53a7116dc192868c70f72f3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 20 三月 2026 17:54:09 +0800
Subject: [PATCH] 【丽水】新增ServiceTask新增四级手术等级代码
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 79 ++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 42 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 44461fa..85f2ff7 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -315,7 +315,10 @@
List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
ServiceSubtaskRes serviceSubtaskRes = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtaskRes.class);
- serviceSubtaskRes.setContinueContent(JSONObject.parseObject(serviceSubtask.getContinueContent()));
+ if(ObjectUtils.isNotEmpty(serviceSubtask.getContinueContent())){
+ serviceSubtaskRes.setContinueContent(serviceSubtask.getContinueContent());
+ }
+ serviceSubtaskResList.add(serviceSubtaskRes);
}
return serviceSubtaskResList;
}
@@ -590,6 +593,7 @@
ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
+ serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
serviceTaskoper.setTaskId(serviceTask.getTaskid());
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(Long.valueOf(serviceTask.getLongTask()));
@@ -617,7 +621,8 @@
serviceTaskdept.setDeptCode(deptCode);
serviceTaskdept.setDeptType("1");
serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
- serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
+ //鍏堥�氳繃浠诲姟ID銆侀儴闂╟ode,鍒ゆ柇ServiceTaskdept鏄惁瀛樺湪锛屼笉瀛樺湪鍒欐柊澧烇紝瀛樺湪鍒欎慨鏀�
+ serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
}
}
if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
@@ -626,7 +631,8 @@
serviceTaskdept.setDeptCode(districtcode);
serviceTaskdept.setDeptType("2");
serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
- serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
+ //鍏堥�氳繃浠诲姟ID銆侀儴闂╟ode,鍒ゆ柇ServiceTaskdept鏄惁瀛樺湪锛屼笉瀛樺湪鍒欐柊澧烇紝瀛樺湪鍒欎慨鏀�
+ serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
}
}
}
@@ -759,15 +765,8 @@
serviceTaskdept.setDeptCode(deptCode);
serviceTaskdept.setDeptType("1");
serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
- ServiceTaskdept st = new ServiceTaskdept();
- st.setDeptCode(deptCode);
- st.setTaskId(serviceTask.getTaskid());
- List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
- if (CollectionUtils.isEmpty(serviceTaskdepts)) {
- serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
- } else {
- serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
- }
+ //鍏堥�氳繃浠诲姟ID銆侀儴闂╟ode,鍒ゆ柇ServiceTaskdept鏄惁瀛樺湪锛屼笉瀛樺湪鍒欐柊澧烇紝瀛樺湪鍒欎慨鏀�
+ serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
}
}
if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
@@ -782,15 +781,7 @@
serviceTaskdept.setDeptType("2");
serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
//鍏堥�氳繃浠诲姟ID銆侀儴闂╟ode,鍒ゆ柇ServiceTaskdept鏄惁瀛樺湪锛屼笉瀛樺湪鍒欐柊澧烇紝瀛樺湪鍒欎慨鏀�
- ServiceTaskdept st = new ServiceTaskdept();
- st.setDeptCode(districtcode);
- st.setTaskId(serviceTask.getTaskid());
- List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
- if (CollectionUtils.isEmpty(serviceTaskdepts)) {
- serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
- } else {
- serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
- }
+ serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
}
}
} else if (serviceTaskVO.getAppltype().equals("3")) {
@@ -831,31 +822,32 @@
}
// serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
+ serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
serviceTaskoper.setTaskId(serviceTask.getTaskid());
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(Long.valueOf(serviceTask.getLongTask()));
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
- if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
- String[] opcodes = serviceTaskVO.getOpcode().split(",");
- for (String opcode : opcodes) {
- //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
- ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
- serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
- serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
- List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
-
- serviceTaskoper.setOpcode(opcode);
- log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
- if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
- serviceTaskoper.setId(serviceTaskopers.get(0).getId());
- serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
- } else {
- serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
- }
- }
- }
+// if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
+// String[] opcodes = serviceTaskVO.getOpcode().split(",");
+// for (String opcode : opcodes) {
+// //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+// ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
+// serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
+// serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
+// List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
+//
+// serviceTaskoper.setOpcode(opcode);
+// log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+// if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
+// serviceTaskoper.setId(serviceTaskopers.get(0).getId());
+// serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
+// } else {
+// serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+// }
+// }
+// }
}
}
if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -3177,7 +3169,7 @@
* @return
*/
@Override
- @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+// @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
@@ -3532,7 +3524,7 @@
diagname.setSuggest(subtask.getSuggest());
diagname.setOperator(subtask.getOperator());
diagname.setFinishtime(subtask.getFinishtime());
- diagname.setLongSendTime(subtask.getLongSendTime());
+ diagname.setVisitTime(subtask.getVisitTime());
diagname.setEndtime(subtask.getEndtime());
//璁＄畻鍑洪櫌澶╂暟
if (!Objects.isNull(diagname.getEndtime())) {
@@ -3553,4 +3545,7 @@
}).collect(Collectors.toList());
}
+ public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity entity){
+ return serviceSubtaskMapper.getCurrentUserServiceSubtaskCount(entity);
+ }
}
--
Gitblit v1.9.3