From b3ba85a04a61d342f21b457bc2caad3e844bbf68 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 05 一月 2026 14:08:11 +0800
Subject: [PATCH] 【市一】随访满意度明细调整

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index e9d9fd6..47a4889 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -16,9 +16,11 @@
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DtoConversionUtils;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.service.ISysConfigService;
 import com.smartor.domain.*;
 import com.smartor.mapper.PatMedInhospMapper;
 import com.smartor.mapper.PatMedOuthospMapper;
@@ -67,6 +69,9 @@
     @Autowired
     private IServiceSubtaskRecordService serviceSubtaskRecordService;
 
+    @Autowired
+    private ISysConfigService configService;
+
     @Value("${spring.profiles.active}")
     private String active;
 
@@ -100,17 +105,9 @@
             if (ObjectUtils.isNotEmpty(serviceTask)) serviceSubtask.setPreachform(serviceTask.getPreachform());
         }
 
-        /**
-         * 浠ｇ爜浼樺寲 鍒嗙缁熻
-        Map<String, Object> map = new HashMap<>();
-        map.put("serviceSubtaskList", serviceSubtaskList);
-        List<Map<String, Object>> list = new ArrayList<>();
-        list.add(map);
-         **/
-        //Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
-        //patItemCount 璋冪敤redisCache璁板綍缁熻鏁版嵁
-//        Map<String, Object> map = patItemCount(serviceSubtaskVO);
-        Map<String, Object> map = serviceSubtaskService.patItemCount1(serviceSubtaskVO);
+//      patItemCount 璋冪敤redisCache璁板綍缁熻鏁版嵁
+//      Map<String, Object> map = patItemCount(serviceSubtaskVO);
+        Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
         map.put("serviceSubtaskList", serviceSubtaskList);
         List<Map<String, Object>> list = new ArrayList<>();
         list.add(map);
@@ -127,7 +124,7 @@
     }
 
     /**
-     * 缁熻闅忚鏁版嵁
+     * 缁熻闅忚鏁版嵁 -- cache鐗�
      */
     @ApiOperation("缁熻闅忚鏁版嵁")
     @PostMapping("/patItemCount")
@@ -235,9 +232,10 @@
             serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
             serviceSubtask.setServiceSubtaskRecordList(serviceSubtaskRecordService.selectServiceSubtaskRecordList(serviceSubtaskRecord));
         }
-        //todo 浠ｇ爜浼樺寲
+//      patItemCount 璋冪敤redisCache璁板綍缁熻鏁版嵁
+//      Map<String, Object> map = patItemCount(serviceSubtaskVO);
         Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
-//        Map<String, Object> map = patItemCount(serviceSubtaskVO);
+
         map.put("serviceSubtaskList", serviceSubtaskList);
         List<Map<String, Object>> list = new ArrayList<>();
         list.add(map);
@@ -540,6 +538,33 @@
         return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq));
     }
 
+    @ApiOperation("鑾峰彇闅忚鍒嗙被缁熻鏄庣粏")
+    @PostMapping("/getSfStatisticsCountDetails")
+    public AjaxResult getSfStatisticsCountDetails(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+        if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() == 0 && serviceSubtaskCountReq.getDeptcodes().size() == 0) {
+            return error("绉戝鎴栫梾鍖轰笉鑳戒负绌�");
+        }
+        //澶嶈瘖缁熻
+        String configKey = serviceSubtaskCountReq.getConfigKey();
+        if(StringUtils.isNotEmpty(configKey)){
+            String configValue = configService.selectConfigByKey(configKey);
+            if(StringUtils.isEmpty(configValue)){
+                String logInfo =  "getSfStatisticsCountDetails-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
+                log.error(logInfo);
+                return error(logInfo);
+            }
+            serviceSubtaskCountReq.setConfigValue(configValue);
+        }else {
+            String logInfo =  "getSfStatisticsCountDetails-鍙傛暟configKey鏈紶鍏�, 璇烽厤缃ソ鍚庨噸璇�";
+            log.error(logInfo);
+            return error(logInfo);
+        }
+
+        LoginUser loginUser = getLoginUser();
+        String orgid = loginUser.getUser().getOrgid();
+        serviceSubtaskCountReq.setOrgid(orgid);
+        return success(serviceSubtaskService.getSfStatisticsScriptDetails(serviceSubtaskCountReq));
+    }
 
     /**
      * 鍙戦�佺煭淇℃ā鏉�

--
Gitblit v1.9.3