From ed9350e35ac05c0b3d5ba03e80ada76b546dccbd Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 20 三月 2026 15:14:52 +0800
Subject: [PATCH] 【丽水】获取随访分类统计明细 去掉缓存读取

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   34 ++++++++++++----------------------
 1 files changed, 12 insertions(+), 22 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 968c490..fb782ab 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -620,7 +620,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())) {
@@ -629,7 +630,8 @@
                             serviceTaskdept.setDeptCode(districtcode);
                             serviceTaskdept.setDeptType("2");
                             serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
-                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
+                            //鍏堥�氳繃浠诲姟ID銆侀儴闂╟ode,鍒ゆ柇ServiceTaskdept鏄惁瀛樺湪锛屼笉瀛樺湪鍒欐柊澧烇紝瀛樺湪鍒欎慨鏀�
+                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                         }
                     }
                 }
@@ -762,15 +764,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())) {
@@ -785,15 +780,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")) {
@@ -3180,7 +3167,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<>();
@@ -3535,7 +3522,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())) {
@@ -3556,4 +3543,7 @@
         }).collect(Collectors.toList());
     }
 
+    public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity entity){
+        return serviceSubtaskMapper.getCurrentUserServiceSubtaskCount(entity);
+    }
 }

--
Gitblit v1.9.3