From 74fbf1d9ae44bf3354f46caa0e43a2358fa1fbea Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 23 九月 2026 17:11:58 +0800
Subject: [PATCH] 【丽水】更新AI电话

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |  516 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 473 insertions(+), 43 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 5640854..b8d7732 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -10,9 +10,11 @@
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.service.IConfigService;
 import com.ruoyi.common.dx.MessageSend;
+import com.ruoyi.common.enums.WxGZHEnum;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.common.utils.sms.smsUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.mapper.SysConfigMapper;
@@ -22,8 +24,10 @@
 import com.smartor.common.ScheduleSubtaskBuilder;
 import com.smartor.config.PhoneUtils;
 import com.smartor.domain.DTO.MydTrendReqDTO;
+import com.smartor.domain.DTO.MzMydScoreRankDTO;
 import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
 import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
+import com.smartor.domain.DTO.ServiceSubtaskOptionStatDTO;
 import com.smartor.domain.*;
 import com.smartor.domain.VO.*;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -45,6 +49,9 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.time.*;
@@ -55,6 +62,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
+import static cn.hutool.core.convert.Convert.toHex;
 
 /**
  * 鍗曚竴浠诲姟锛堥殢璁匡級Service涓氬姟灞傚鐞�
@@ -631,6 +640,43 @@
     }
 
     /**
+     * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺锛堝凡浼樺寲锛�
+     * 浼樺寲璇存槑锛�
+     * 1. 浣跨敤鏁版嵁搴撳眰鑱氬悎璁$畻锛屾浛浠e簲鐢ㄥ眰閬嶅巻
+     * 2. 鎬ц兘鎻愬崌 10-100 鍊嶏紙鍙栧喅浜庢暟鎹噺锛�
+     * 3. 闄嶄綆鍐呭瓨鍗犵敤鍜岀綉缁滀紶杈�
+     *
+     * @param serviceSubtaskEntity 鏌ヨ鏉′欢
+     * @return 鍚勭姸鎬佺粺璁$粨鏋�
+     */
+    @Override
+    public Map<String, Object> countByCondition(ServiceSubtaskEntity serviceSubtaskEntity) {
+        // 鐩存帴璋冪敤鏁版嵁搴撶粺璁℃柟娉曪紝鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠�
+        Map<String, Object> result = serviceSubtaskMapper.countByCondition(serviceSubtaskEntity);
+        // 澶勭悊绌哄紓甯�
+        if (MapUtils.isEmpty(result)) {
+            result = new HashMap<>();
+            // 纭繚鎵�鏈� key 閮芥湁鍊硷紝閬垮厤绌烘寚閽堝紓甯�
+            // MyBatis 鐨� SUM 鍦ㄦ病鏈夊尮閰嶈鏃朵細杩斿洖 null
+            result.putIfAbsent("wzx", 0);
+            result.putIfAbsent("ysf", 0);
+            result.putIfAbsent("fssb", 0);
+            result.putIfAbsent("yfs", 0);
+            result.putIfAbsent("blq", 0);
+            result.putIfAbsent("total", 0);
+            result.putIfAbsent("wxsf", 0);
+            result.putIfAbsent("xsf", 0);
+            result.putIfAbsent("dsf", 0);
+            result.putIfAbsent("dfs", 0);
+            result.putIfAbsent("yfs", 0);
+            result.putIfAbsent("ywc", 0);
+            result.putIfAbsent("yc", 0);
+            result.putIfAbsent("jg", 0);
+        }
+        return result;
+    }
+
+    /**
      * 鏂板鍗曚竴浠诲姟锛堥殢璁匡級
      *
      * @param serviceSubtask 鍗曚竴浠诲姟锛堥殢璁匡級
@@ -1055,8 +1101,8 @@
             //灏嗕换鍔′俊鎭斁鍒版湇鍔¤〃涓�
             ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
             serviceSubtask.setTaskid(serviceTask.getTaskid().longValue());
-            serviceSubtask.setTemplatename(tempName);
-            serviceSubtask.setTemplateid(tempid);
+            serviceSubtask.setTemplatename(ObjectUtils.isNotEmpty(tempid) ? tempName : serviceTask.getTemplatename());
+            serviceSubtask.setTemplateid(ObjectUtils.isNotEmpty(tempid) ? tempid : serviceTask.getTemplateid());
             serviceSubtask.setLibtemplateid(ObjectUtils.isEmpty(serviceTask.getLibtemplateid()) ? null : Long.valueOf(serviceTask.getLibtemplateid()));
             serviceSubtask.setLibtemplatename(serviceTask.getLibtemplatename());
             //鏂板
@@ -1431,6 +1477,8 @@
                     ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
                     serviceSubtask.setLibtemplateid(ObjectUtils.isEmpty(serviceTaskVO.getLibtemplateid()) ? null : Long.valueOf(serviceTaskVO.getLibtemplateid()));
                     serviceSubtask.setLibtemplatename(serviceTaskVO.getLibtemplatename());
+                    serviceSubtask.setTemplateid(serviceTask.getTemplateid());
+                    serviceSubtask.setTemplatename(serviceTask.getTemplatename());
                     serviceSubtask.setSendname(patTaskRelevance.getName());
                     serviceSubtask.setAge(patTaskRelevance.getAge());
                     serviceSubtask.setSfzh(patTaskRelevance.getSfzh());
@@ -5093,6 +5141,12 @@
         String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
         String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
 
+        //涓芥按涓尰闄㈠彂閫佺殑鏄井淇″叕浼楀彿
+        if (StringUtils.isNotEmpty(serviceSubtask.getOrgid()) && serviceSubtask.getOrgid().equals("47231022633110211A2101")) {
+            resultMap = wechatSubTask(subid);
+            return resultMap;
+        }
+
         //鍙戦�佹暟鎹殑灏佽
         ServiceOutPath serviceOutPath = new ServiceOutPath();
         serviceOutPath.setParam1(taskId);
@@ -5137,14 +5191,90 @@
         return resultMap;
     }
 
+    public Map<String,Object> wechatSubTask(Long subid){
+        log.info("wechatSubTask鐨勫叆鍙備负锛歿}", subid);
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("code", "500");
+        resultMap.put("msg", "鍙戦�佸け璐�");
+        try{
+            //鑾峰彇闅忚鐨勫熀鏈俊鎭�
+            ServiceSubtask serviceSubtask = selectServiceSubtaskById(subid);
+            //鑾峰彇鎮h�呬俊鎭�
+            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask.getPatid());
+
+            RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+            String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+            String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
+            String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
+            String url = localIP + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3="
+                    + URLEncoder.encode(serviceSubtask.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false"
+                    + "$param6=" + subId;
+
+            ServiceOutPath serviceOutPath = new ServiceOutPath();
+            serviceOutPath.setParam1(taskId);
+            serviceOutPath.setParam2(patid);
+            serviceOutPath.setParam3(serviceSubtask.getTaskName());
+            serviceOutPath.setParam6(subId);
+            serviceOutPath.setCreateTime(new Date());
+            serviceOutPath.setOrgid(serviceSubtask.getOrgid());
+            iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+            String format = String.format("%03X", serviceOutPath.getId());
+            serviceOutPath.setRadix(format);
+            serviceOutPath.setUpdateTime(new Date());
+            serviceOutPath.setUrl(url);
+            iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+
+
+            //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
+            List<String> wxqqxx = WxGZHEnum.getDescByCode(serviceSubtask.getOrgid());
+            if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "鍙戦�佸紓甯革細" + "銆愬叕浼楀彿銆戣鏈烘瀯鐨勫叕浼楀彿閰嶇疆淇℃伅涓嶅叏锛屾棤娉曢�氳繃鍏紬鍙峰彂閫�");
+                return resultMap;
+            }
+
+            if (StringUtils.isEmpty(serviceSubtask.getPatidHis())) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "鍙戦�佸紓甯革細" + "銆愬叕浼楀彿銆戝叕浼楀彿鍙戦�佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
+                return resultMap;
+            }
+            String wxCode = "";
+            wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
+            Map map = JSONObject.parseObject(wxCode, Map.class);
+            Boolean wxCodeSuccess = false;
+            if (!map.isEmpty() && map.get("succ") != null) {
+                wxCodeSuccess = (boolean) map.get("succ");
+            }
+
+            //鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
+            serviceSubtask.setSendstate(3L);
+            if (wxCodeSuccess) {
+                serviceSubtask.setResult("success");
+                resultMap.put("code", "200");
+                resultMap.put("msg", "鍙戦�佹垚鍔�");
+            } else {
+                log.error("銆恠fHandlle銆戝叕浼楀彿鍙戦�佸け璐ワ紝鎮h�呬俊鎭細{}锛岄敊璇俊鎭細{}", serviceSubtask, map.get("msg"));
+                resultMap.put("code", -1);
+                resultMap.put("message", "銆愬叕浼楀彿銆戝叕浼楀彿鍙戦�佸け璐�");
+                return resultMap;
+            }
+        } catch (Exception e) {
+            String guid = UUID.randomUUID().toString();
+            log.error("銆恠fHandlle銆戦暱鏈熶换鍔″叕浼楀彿鍙戦�佸け璐ワ紝鍘熷洜锛歿}锛孏UID锛歿}", e.getMessage(), guid);
+            resultMap.put("code", -1);
+            resultMap.put("message", "銆愬叕浼楀彿銆戦暱鏈熶换鍔″叕浼楀彿鍙戦�佸け璐ワ紝鍘熷洜锛�" + e.getMessage());
+            return resultMap;
+        }
+        return resultMap;
+    }
     @Override
-    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType) {
+    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType, List<Long> subtaskIds) {
         //鍏堟竻鐞嗕竴涓嬮噸澶嶆暟鎹�
         List<Long> repeatIds = serviceSubtaskDetailMapper.selectRepeatDetailIds();
         if (!CollectionUtils.isEmpty(repeatIds)) {
             serviceSubtaskDetailMapper.deleteRepeatDetailByIds(repeatIds);
         }
-        List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType);
+        List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType, subtaskIds);
 
         // 澶勭悊 targetvalue锛氭寜 & 鍒嗗壊鎴愬鏉¤褰�
         List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
@@ -5154,7 +5284,9 @@
                 // 濡傛灉鏈夊鏉$洰鏍囧�硷紝鎷嗗垎鎴愬琛�
                 for (String value : values) {
                     //鍏堝幓 result 涓煡涓�涓嬶紝鏈夋病鏈夎繖涓� questiontext 鍜屽搴旂殑 targetvalue
-                    ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
+                    //娉ㄦ剰蹇呴』甯︿笂 taskid 涓�璧峰尮閰嶏細鍚﹀垯浼氭妸鍒殑浠诲姟鐨勬暟鎹~鍒版湰浠诲姟鐨勮涓婏紝
+                    //瀵艰嚧瀵煎嚭鐨勩�屾暟閲�/姣斾緥銆嶅拰璇ヨ鐨勩�屼换鍔″悕绉�/浠诲姟缂栧彿銆嶅涓嶄笂锛堝悓涓�浠诲姟鍚屼竴棰樺嚭鐜颁袱涓笉鍚屽垎姣嶏級
+                    ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> Objects.equals(e.getTaskid(), export.getTaskid()) && e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
                     if (existingExport != null && existingExport.getRatio().equals("0") && existingExport.getCount().equals("0")) {
                         //濡傛灉瀛樺湪锛屽垯灏� result 閲岀殑杩欎釜闂鎵�瀵瑰簲鐨� Targetvalue=value 杩欐潯鏁版嵁鏇存柊鎴愬綋鍓嶈繖鏉℃暟鎹�
                         if (value.equals(export.getOptionresult())) {
@@ -5183,6 +5315,152 @@
         }
 
         return result;
+    }
+
+    @Override
+    public List<ServiceSubtaskDetailRatioExport> statMydQuestionOptionForExport(List<Long> subtaskIds, String questiontext) {
+        List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
+        if (CollectionUtils.isEmpty(subtaskIds)) {
+            return result;
+        }
+        List<ServiceSubtaskOptionStatDTO> statList = serviceSubtaskMapper.statMydQuestionOptionForExport(subtaskIds, questiontext);
+        if (CollectionUtils.isEmpty(statList)) {
+            return result;
+        }
+        return buildMydOptionRows(statList);
+    }
+
+    /**
+     * 鎶娿�屼换鍔�+棰樼洰+閫夐」銆嶇殑浣滅瓟缁熻鎷兼垚瀵煎嚭鐨勩�岄棶棰樿鎯呭崰姣斻�嶈
+     * <ul>
+     *     <li>閫夐」娓呭崟锛氶鐩厤缃繃鐨勯�夐」鍦� targetvalue锛堢敤 & 杩炴帴锛夐噷锛屽叏閮ㄥ垪鍑猴紝娌′汉閫夌殑鏄剧ず 0</li>
+     *     <li>鏁伴噺锛氭偅鑰呴�変腑鐨勯�夐」鍦� asrtext 閲岋紙澶氶�夐鏄�孉&B銆嶏級锛屾瘡涓�変腑椤瑰悇璁颁竴娆′汉鏁帮紝涓�涓偅鑰呭彧绠椾竴鏉℃槑缁�</li>
+     *     <li>姣斾緥锛氭暟閲� / 璇ラ浣滅瓟鎮h�呮暟锛屾墍浠ュ崟閫夐鍚勯�夐」鏁伴噺涔嬪拰 = 璇ラ浣滅瓟鎮h�呮暟</li>
+     *     <li>鍒嗘暟锛氳閫夐」鏄庣粏鐨� score 涔嬪拰锛涘閫夎鎸夐�変腑椤逛唤鏁板潎鍒嗭紝淇濊瘉鍚勯�夐」鍒嗘暟涔嬪拰 = 鏄庣粏鍒嗘暟涔嬪拰</li>
+     * </ul>
+     */
+    private static List<ServiceSubtaskDetailRatioExport> buildMydOptionRows(List<ServiceSubtaskOptionStatDTO> statList) {
+        List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
+
+        // 鎸夈�屼换鍔� + 棰樼洰銆嶅垎缁勶紝淇濇寔 SQL 鐨勯『搴忥紙鍏堥鐩悗浠诲姟锛�
+        Map<String, List<ServiceSubtaskOptionStatDTO>> grouped = new LinkedHashMap<>();
+        for (ServiceSubtaskOptionStatDTO stat : statList) {
+            String key = stat.getTaskid() + "\u0001" + stat.getQuestiontext();
+            grouped.computeIfAbsent(key, k -> new ArrayList<>()).add(stat);
+        }
+
+        for (List<ServiceSubtaskOptionStatDTO> group : grouped.values()) {
+            ServiceSubtaskOptionStatDTO first = group.get(0);
+            // 閫夐」 -> 浜烘暟锛坙ong[1] 渚夸簬绱姞锛夛紝椤哄簭鍗冲嚭鐜伴『搴�
+            Map<String, long[]> countMap = new LinkedHashMap<>();
+            Map<String, BigDecimal> scoreMap = new LinkedHashMap<>();
+
+            for (ServiceSubtaskOptionStatDTO stat : group) {
+                // targetvalue = 鏈鎵�鏈夐�夐」鐨勬竻鍗曪紝娌′汉閫夌殑涔熻鍒楀嚭鏉�
+                List<String> options = splitOptions(stat.getTargetvalue());
+                // asrtext = 鎮h�呭疄闄呴�変腑鐨勯�夐」锛屽閫夐浼氭槸銆岄�変腑椤�1&閫変腑椤�2銆�
+                List<String> chosenOptions = splitOptions(stat.getOptionresult());
+                for (String option : options) {
+                    countMap.computeIfAbsent(option, k -> new long[1]);
+                    scoreMap.computeIfAbsent(option, k -> BigDecimal.ZERO);
+                }
+
+                long patientCount = stat.getPatientCount() == null ? 0L : stat.getPatientCount();
+                BigDecimal scoreSum = stat.getScoreSum() == null ? BigDecimal.ZERO : stat.getScoreSum();
+
+                if (!chosenOptions.isEmpty()) {
+                    BigDecimal[] scoreParts = splitScore(scoreSum, chosenOptions.size());
+                    for (int i = 0; i < chosenOptions.size(); i++) {
+                        String chosen = chosenOptions.get(i);
+                        // 閫変腑鐨勯�夐」鍙兘涓嶅湪閰嶇疆娓呭崟閲岋紙鍘嗗彶鏁版嵁锛夛紝琛ヤ竴琛�
+                        countMap.computeIfAbsent(chosen, k -> new long[1]);
+                        scoreMap.computeIfAbsent(chosen, k -> BigDecimal.ZERO);
+                        countMap.get(chosen)[0] += patientCount;
+                        scoreMap.put(chosen, scoreMap.get(chosen).add(scoreParts[i]));
+                    }
+                } else if (options.size() == 1) {
+                    // 娌℃湁 asrtext锛堟湭绛�/鏃犲簲绛旓級鏃讹紝鍙湁鍞竴閫夐」鎵嶈兘纭畾褰掑睘
+                    countMap.get(options.get(0))[0] += patientCount;
+                    scoreMap.put(options.get(0), scoreMap.get(options.get(0)).add(scoreSum));
+                }
+            }
+
+            long total = 0L;
+            for (long[] count : countMap.values()) total += count[0];
+
+            for (Map.Entry<String, long[]> entry : countMap.entrySet()) {
+                long count = entry.getValue()[0];
+                ServiceSubtaskDetailRatioExport row = new ServiceSubtaskDetailRatioExport();
+                row.setQuestiontext(first.getQuestiontext());
+                row.setOptionresult(entry.getKey());
+                row.setTargetvalue(entry.getKey());
+                row.setCount(String.valueOf(count));
+                row.setRatio(formatRatio(count, total));
+                row.setScore(formatScore(scoreMap.get(entry.getKey())));
+                row.setTaskname(first.getTaskName());
+                row.setTaskid(first.getTaskid());
+                row.setValueType(first.getValueType());
+                result.add(row);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 鎶婁竴鏉℃槑缁嗙殑鍒嗘暟鎸夐�変腑椤逛唤鏁板潎鍒嗭紝浣欐暟琛ョ粰绗竴涓紝淇濊瘉鍚勪唤涔嬪拰 = 鍘熷垎鏁�
+     */
+    private static BigDecimal[] splitScore(BigDecimal total, int parts) {
+        BigDecimal[] result = new BigDecimal[parts];
+        if (parts <= 0) {
+            return result;
+        }
+        BigDecimal each = total.divide(BigDecimal.valueOf(parts), 2, RoundingMode.HALF_UP);
+        for (int i = 0; i < parts; i++) {
+            result[i] = each;
+        }
+        result[0] = result[0].add(total.subtract(each.multiply(BigDecimal.valueOf(parts))));
+        return result;
+    }
+
+    /**
+     * 鎷嗗垎棰樼洰閰嶇疆鐨勯�夐」锛堝涓�夐」鐢� & 杩炴帴锛夛紝椤哄甫鍘绘帀鍏ㄨ/鍗婅绌虹櫧
+     */
+    private static List<String> splitOptions(String targetvalue) {
+        List<String> options = new ArrayList<>();
+        if (StringUtils.isEmpty(targetvalue)) {
+            return options;
+        }
+        for (String part : targetvalue.split("&")) {
+            String option = trimAll(part);
+            if (StringUtils.isNotEmpty(option) && !options.contains(option)) {
+                options.add(option);
+            }
+        }
+        return options;
+    }
+
+    /**
+     * 姣斾緥锛氭暟閲� / 璇ラ浣滅瓟鎮h�呮暟锛屼繚鐣欎袱浣嶅皬鏁�
+     */
+    private static String formatRatio(long count, long total) {
+        if (total <= 0) {
+            return "0.00%";
+        }
+        return BigDecimal.valueOf(count * 100.0 / total).setScale(2, RoundingMode.HALF_UP).toPlainString() + "%";
+    }
+
+    /**
+     * 鍒嗘暟涔嬪拰锛氬幓鎺夊浣欑殑灏忔暟浣嶏紙0.00 -> 0锛�
+     */
+    private static String formatScore(BigDecimal score) {
+        if (score == null) {
+            return "0";
+        }
+        BigDecimal value = score.stripTrailingZeros();
+        if (value.scale() < 0) {
+            value = value.setScale(0);
+        }
+        return value.toPlainString();
     }
 
     /*
@@ -5952,7 +6230,8 @@
                 phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask.getJsy());
                 //璁板綍鐘舵��
                 setFailPreachForm(serviceSubtask, "3", "鐢佃瘽鎷ㄦ墦宸插畬鎴�", "9");
-                return phoneCallBackYQVO;
+                back = phoneCallBackYQVO;
+                return back;
             }
 
             flag = 1;
@@ -5960,9 +6239,10 @@
             redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "PlayEventCallbackPlaystop");
 //                        //鑾峰彇涓嬩竴棰�
             log.error("鑾峰彇涓嬩竴棰樼殑淇℃伅锛歿}", ivrTaskTemplateScriptVO);
-            if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1") || ivrTaskTemplateScriptVO.getBranchFlag().equals("0") && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
+            //branchFlag涓簄ull鏃舵寜鍒嗘敮0澶勭悊锛岄伩鍏峃PE
+            if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag()) || "0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
                 Long nextQuestion = null;
-                if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1")) {
+                if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag())) {
                     nextQuestion = chosenOption.getNextQuestion();
                     //鏇存柊鍒嗘暟
                     double score = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
@@ -5995,15 +6275,9 @@
                     redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
                     phoneCallBackYQVO.setType("text");
                     phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask.getJsy());
-                    //灏嗙粨鏋滃啓杩沝etail琛�
-                    ServiceSubTaskDetailReq ssdReq = new ServiceSubTaskDetailReq();
-                    List<ServiceSubtaskDetail> serviceSubtaskDetailList2 = new ArrayList<>();
-                    serviceSubtaskDetailList.add(getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate));
-                    serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList2);
-                    ssdReq.setGuid(phoneCallReqYQVO.getGuid());
-                    ssdReq.setOrgid(phoneCallReqYQVO.getOrgid());
-                    saveQuestionAnswerPhone(ssdReq);
-                    return phoneCallBackYQVO;
+                    //鏄庣粏鍦ㄦ湰棰樺尮閰嶆垚鍔熸椂宸茶惤搴擄紙瑙佷笂鏂� saveQuestionAnswerPhone锛夛紝杩欓噷涓嶅啀閲嶅淇濆瓨
+                    back = phoneCallBackYQVO;
+                    return back;
                 }
 
                 for (IvrTaskTemplateScript script : ivrTaskTemplateScripts) {
@@ -6020,6 +6294,15 @@
                         redisCache.deleteObject(phoneCallReqYQVO.getTaskid().trim() + "&&" + "mate" + "&&" + phoneCallReqYQVO.getUuid());
                     }
                 }
+                //涓嬩竴棰樿剼鏈病鎵惧埌鏃讹紝鍏滃簳閲嶉棶褰撳墠棰橈紝閬垮厤璋冪敤鏂硅鍒や负鏈鐞嗚�岄��鍥炴鍒欒瘑鍒�
+                if (StringUtils.isEmpty(phoneCallBackYQVO.getValue())) {
+                    log.error("涓嬩竴棰樿剼鏈湭鎵惧埌锛岄噸闂綋鍓嶉锛宯extQuestion锛歿}", nextQuestion);
+                    phoneCallBackYQVO.setType("text");
+                    phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
+                    phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + getObject(serviceSubtask, questionText));
+                }
+                back = phoneCallBackYQVO;
+                return back;
             } else if (ivrTaskTemplateScriptVO.getNextScriptno() == null || ivrTaskTemplateScriptVO.getNextScriptno() == 0) {
                 ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
                 phoneCallBackYQVO.setType("text");
@@ -6048,33 +6331,101 @@
                 //鍦╮edis涓繚瀛樹竴涓嬬粨鏉熻锛屽湪璋冪敤鎸傜數璇濈殑鏂规硶鏃跺垹闄�
                 ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
                 redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
-//                                return phoneCallBackYQVO;
+                //缁撴潫璇凡鎷艰繘杩斿洖鍊硷紝鎸傛満鐢卞钩鍙版寜杩斿洖鍊兼墽琛�
+                back = phoneCallBackYQVO;
+                return back;
 
             }
         } else {
-            log.info("娌℃湁鍖归厤涓�----------------------------");
-            //flag=0,璇存槑娌� 鍖归厤涓婏紝涔熻鎶婃偅鑰呰鐨勮瘽璁板綍涓嬫潵
-            if (matched == ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().size() - 1 && flag == 0) {
-                ServiceSubTaskDetailReq serviceSubTaskDetailReq = new ServiceSubTaskDetailReq();
-                List<ServiceSubtaskDetail> serviceSubtaskDetailList = new ArrayList<>();
-                ServiceSubtaskDetail serviceSubtaskDetail = getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate);
-                //淇敼涓�涓嬭闊宠矾寰勶紙鏀规垚鍓嶇鍙互璁块棶鐨勶紝瀛樺埌鏁版嵁搴撲腑锛�
-                if (StringUtils.isNotEmpty(serviceSubtaskDetail.getQuestionvoice())) {
-                    String questionvoice = serviceSubtaskDetail.getQuestionvoice();
-                    String[] split = questionvoice.split("\\\\");
-                    if (split.length > 0) {
-                        String lastPart = split[split.length - 1];
-                        serviceSubtaskDetail.setQuestionvoice(voicePathPrefix + lastPart);
+            //AI娌℃湁鍖归厤涓婏細鐢盇I鍒嗘敮鑷繁鎸�"娌¢棶娓呭氨閲嶉棶"鐨勬鏁板鐞嗭紝涓嶅啀閫�鍥炴鍒欒瘑鍒�
+            log.info("ai娌℃湁鍖归厤涓�----------------------------");
+            //娌″尮閰嶄笂涔熻鎶婃偅鑰呰鐨勮瘽璁板綍涓嬫潵锛坢atchedtext缃┖锛屼笌姝e垯璺緞鍙e緞涓�鑷达級
+            ServiceSubTaskDetailReq serviceSubTaskDetailReq = new ServiceSubTaskDetailReq();
+            List<ServiceSubtaskDetail> serviceSubtaskDetailList = new ArrayList<>();
+            ServiceSubtaskDetail serviceSubtaskDetail = getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate);
+            //淇敼涓�涓嬭闊宠矾寰勶紙鏀规垚鍓嶇鍙互璁块棶鐨勶紝瀛樺埌鏁版嵁搴撲腑锛�
+            if (StringUtils.isNotEmpty(serviceSubtaskDetail.getQuestionvoice())) {
+                String questionvoice = serviceSubtaskDetail.getQuestionvoice();
+                String[] split = questionvoice.split("\\\\");
+                if (split.length > 0) {
+                    String lastPart = split[split.length - 1];
+                    serviceSubtaskDetail.setQuestionvoice(voicePathPrefix + lastPart);
+                }
+            }
+            serviceSubtaskDetailList.add(serviceSubtaskDetail);
+            //濡傛灉娌℃湁 鍖归厤涓婏紝杩欎釜蹇呴』涓簄ull
+            serviceSubtaskDetailList.get(0).setMatchedtext("");
+            serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList);
+            serviceSubTaskDetailReq.setGuid(phoneCallReqYQVO.getGuid());
+            serviceSubTaskDetailReq.setOrgid(phoneCallReqYQVO.getOrgid());
+            saveQuestionAnswerPhone(serviceSubTaskDetailReq);
+
+            String mateKey = phoneCallReqYQVO.getTaskid().trim() + "&&" + "mate" + "&&" + phoneCallReqYQVO.getUuid();
+            Integer count = null;
+            Object countObj = redisCache.getCacheObject(mateKey);
+            if (ObjectUtils.isNotEmpty(countObj)) count = (Integer) countObj;
+            if (count != null && count >= ivrTaskTemplate.getMateNum()) {
+                //娌″尮閰嶆鏁板凡缁忕敤婊★紝涓嶈兘鍐嶉噸闂簡
+                boolean noNextQuestion = ("0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) || "1".equals(ivrTaskTemplateScriptVO.getBranchFlag()))
+                        && (ivrTaskTemplateScriptVO.getNextScriptno() == null || ivrTaskTemplateScriptVO.getNextScriptno() == 0);
+                if (noNextQuestion) {
+                    //宸茬粡鏄渶鍚庝竴棰橈紝鐩存帴鎸傛満
+                    ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+                    phoneCallBackYQVO.setType("text");
+                    phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
+                    phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask1.getJsy());
+                    //鏇存柊涓�涓嬪垎鏁�
+                    Double score = null;
+                    Object scoreObj = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
+                    if (ObjectUtils.isNotEmpty(scoreObj)) score = (Double) scoreObj;
+                    serviceSubtask.setScore(String.valueOf(score));
+                    serviceSubtask.setFinishtime(new Date());
+                    serviceSubtask.setSendstate(6L);
+                    serviceSubtask.setRemark("鐢佃瘽鎷ㄦ墦宸插畬鎴�");
+                    serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+                    //璁板綍鐘舵��
+                    setFailPreachForm(serviceSubtask, "3", "鐢佃瘽鎷ㄦ墦宸插畬鎴�", "9");
+                    //鍦╮edis涓繚瀛樹竴涓嬬粨鏉熻锛屽湪璋冪敤鎸傜數璇濈殑鏂规硶鏃跺垹闄�
+                    ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+                    redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
+                    //鍘籸edis涓紝鎶婅瀛愪换鍔D鍒犻櫎
+                    Long id = serviceSubtask.getId();
+                    Map<String, String> map = delRedisValue(null, id.toString());
+                    if (ObjectUtils.isNotEmpty(map)) {
+                        redisCache.setCacheObject(map.get("cacheName"), map.get("val"));
+                        redisCache.deleteObject(serviceSubtask.getId() + "-" + serviceSubtask.getPhone());
+                        redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "SCORE");
+                    }
+                } else {
+                    //杩樻湁涓嬩竴棰橈紝鎸塶extScriptno缁х画鎻愰棶
+                    for (IvrTaskTemplateScript script : ivrTaskTemplateScripts) {
+                        if (script.getSort() == ivrTaskTemplateScriptVO.getNextScriptno().intValue()) {
+                            phoneCallBackYQVO.setType("text");
+                            phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
+                            String scriptContent = StringUtils.isNotEmpty(script.getIvrtext()) ? script.getIvrtext() : script.getScriptContent();
+                            phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + getObject(serviceSubtask, scriptContent));
+                            //灏嗚鎮h�呯殑Redis涓殑棰樼洰ID锛岃繘琛屼慨鏀�
+                            redisCache.setCacheObject(phoneCallReqYQVO.getTaskid().trim() + "-" + phoneCallReqYQVO.getPhone().trim(), script.getId().toString(), 120, TimeUnit.MINUTES);
+                            //鏇存柊涓�涓嬪垎鏁�
+                            Double score = null;
+                            Object scoreObj = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
+                            if (ObjectUtils.isNotEmpty(scoreObj)) score = (Double) scoreObj;
+                            score = BigDecimal.valueOf(score).add(new BigDecimal(script.getScore())).doubleValue();
+                            redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "SCORE", score, 120, TimeUnit.MINUTES);
+                            //鎹㈤鎴愬姛锛屾病鍖归厤娆℃暟娓呴浂
+                            redisCache.deleteObject(mateKey);
+                        }
                     }
                 }
-                serviceSubtaskDetailList.add(serviceSubtaskDetail);
-                //濡傛灉娌℃湁 鍖归厤涓婏紝杩欎釜蹇呴』涓簄ull
-                serviceSubtaskDetailList.get(0).setMatchedtext("");
-                serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList);
-                serviceSubTaskDetailReq.setGuid(phoneCallReqYQVO.getGuid());
-                serviceSubTaskDetailReq.setOrgid(phoneCallReqYQVO.getOrgid());
-                saveQuestionAnswerPhone(serviceSubTaskDetailReq);
+            } else {
+                //杩樻病闂弧娆℃暟锛岀敤noMatchText寮曞鎮h�呴噸绛�
+                redisCache.setCacheObject(mateKey, count == null ? 1 : count + 1, 120, TimeUnit.MINUTES);
+                phoneCallBackYQVO.setType("text");
+                phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
+                phoneCallBackYQVO.setValue(ivrTaskTemplateScriptVO.getNoMatchText() + getObject(serviceSubtask, StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrtext()) ? ivrTaskTemplateScriptVO.getIvrtext() : ivrTaskTemplateScriptVO.getScriptContent()));
             }
+            back = phoneCallBackYQVO;
+            return back;
         }
         return back;
     }
@@ -6089,17 +6440,31 @@
      */
     public List<ServiceSubtaskDetailRatioExport> getDetailRatio(SltdMydTotalVO sltdMydTotalVO, List<ServiceSubtaskRes> serviceSubtaskRes) {
         List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = null;
-        if (CollectionUtils.isNotEmpty(sltdMydTotalVO.getServiceTypeList()) && sltdMydTotalVO.getServiceTypeList().contains("2") && (sltdMydTotalVO.getServiceTypeList().contains("6") || sltdMydTotalVO.getServiceTypeList().contains("14"))) {
-            //serviceType锛屽嵆鏈夐殢璁垮張鏈夋弧鎰忓害锛屾殏鏃舵病娉曠粺璁�
+        List<String> serviceTypeList = sltdMydTotalVO.getServiceTypeList();
+        if (CollectionUtils.isEmpty(serviceTypeList)) {
+            log.warn("getDetailRatio 鏈紶 serviceTypeList锛屾棤娉曠粺璁¢棶棰樺崰姣�");
             return serviceSubtaskDetailRatioExports;
-        } else if (CollectionUtils.isNotEmpty(sltdMydTotalVO.getServiceTypeList()) && sltdMydTotalVO.getServiceTypeList().contains("2")) {
+        }
+        // 鍒ゆ柇鍙e緞锛�2=闅忚锛堟寜 taskid 缁熻锛夛紝6/14=婊℃剰搴︼紙鎸� subtask id 缁熻锛�
+        boolean hasFollowUp = serviceTypeList.contains("2");
+        boolean hasSatisfaction = serviceTypeList.contains("6") || serviceTypeList.contains("14");
+        if (hasFollowUp && hasSatisfaction) {
+            //serviceType锛屽嵆鏈夐殢璁垮張鏈夋弧鎰忓害锛屾殏鏃舵病娉曠粺璁�
+            log.warn("getDetailRatio 鏆備笉鏀寔鍚屾椂缁熻闅忚(2)涓庢弧鎰忓害(6/14)锛宻erviceTypeList={}", serviceTypeList);
+            return serviceSubtaskDetailRatioExports;
+        }
+        if (hasFollowUp) {
             //鑾峰彇serviceSubtaskList涓殑鎵�鏈塼askid
             List<Long> taskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getTaskid).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
-            serviceSubtaskDetailRatioExports = statQuestionOption(taskIds, sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType());
-        } else if (CollectionUtils.isNotEmpty(sltdMydTotalVO.getServiceTypeList()) && sltdMydTotalVO.getServiceTypeList().contains("6") || sltdMydTotalVO.getServiceTypeList().contains("14")) {
+            //鍚屾椂甯︿笂鏈瀵煎嚭鐨勫瓙浠诲姟 id锛氳銆岄棶棰樿鎯呭崰姣斻�嶅彧缁熻杩欐壒鎮h�咃紝涓庛�屾偅鑰呴殢璁夸俊鎭〃鍗曘�嶅彛寰勪竴鑷�
+            List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
+            serviceSubtaskDetailRatioExports = statQuestionOption(taskIds, sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType(), subtaskIds);
+        } else if (hasSatisfaction) {
             //婊℃剰搴︾粺璁� 锛堥�氳繃 subtask 鐨� id 鍘荤粺璁★級
             List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).collect(Collectors.toList());
             serviceSubtaskDetailRatioExports = statQuestionOptionBySubtaskIds(subtaskIds, sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType());
+        } else {
+            log.warn("getDetailRatio 鏆備笉鏀寔鐨� serviceTypeList={}锛堜粎鏀寔 2 鎴� 6/14锛�", serviceTypeList);
         }
         return serviceSubtaskDetailRatioExports;
     }
@@ -6415,4 +6780,69 @@
 
         return result;
     }
+
+    /**
+     * 闂ㄨ瘖婊℃剰搴︾患鍚堝緱鍒嗘帓鍚嶏紙鎸夌瀹ゆ垨鐥呭尯锛�
+     * <p>
+     * 缁煎悎婊℃剰搴� = 危(璇勫垎鏄庣粏鏉冮噸) / 璇勫垎鏄庣粏鏉℃暟 脳 100%锛�
+     * 鏉冮噸鍙彇 1銆�0.8銆�0.6銆�0.4銆�0.2 浜旀。锛堝緢婊℃剰銆佹弧鎰忋�佷竴鑸�佷笉婊℃剰銆佸緢涓嶆弧鎰忥級銆�
+     *
+     * @param mzMydScoreRankVO 鏌ヨ鏉′欢
+     * @return 鎺掑悕缁撴灉锛屽悕娆′粠 1 寮�濮嬮『搴忕紪鍙�
+     */
+    @Override
+    public List<MzMydScoreRankDTO> mzMydScoreRank(MzMydScoreRankVO mzMydScoreRankVO) {
+        if (StringUtils.isEmpty(mzMydScoreRankVO.getDimensionType())) {
+            mzMydScoreRankVO.setDimensionType("1");
+        }
+        if (CollectionUtils.isEmpty(mzMydScoreRankVO.getServiceTypes())) {
+          List<String> list=new ArrayList<>(Arrays.asList("14"));
+            mzMydScoreRankVO.setServiceTypes(list);
+        }
+        List<MzMydScoreRankDTO> list = serviceSubtaskMapper.selectMzMydScoreRank(mzMydScoreRankVO);
+        if (CollectionUtils.isEmpty(list)) {
+            return new ArrayList<>();
+        }
+        // 鍚嶆锛歋QL 宸叉寜缁煎悎寰楀垎闄嶅簭杩斿洖锛岃繖閲岄『搴忕紪鍙�
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setRank(i + 1);
+        }
+        return list;
+    }
+
+    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid, List<String> wxqqxx) {
+        XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
+        xinHuaWXReq.setIdcard(idcard);
+        xinHuaWXReq.setUrl(url);
+        xinHuaWXReq.setPatientid(setPatientid);
+        xinHuaWXReq.setPatientname(setPatientname);
+        xinHuaWXReq.setMobile(phone);
+        xinHuaWXReq.setMedcardno(null);
+        xinHuaWXReq.setTitlename(taskName);
+        xinHuaWXReq.setContent(taskDesc);
+        xinHuaWXReq.setAppid(wxqqxx.get(1));
+        log.info("銆恎etWXCode銆戝井淇″叕浼楀彿璇锋眰鍙傛暟锛歿}", xinHuaWXReq);
+        String body = new Gson().toJson(xinHuaWXReq);
+        String encode = encode(wxqqxx.get(2).concat(body));
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("sign", encode);
+        String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
+        log.info("銆恎etWXCode銆戝井淇″叕浼楀彿杩斿洖鍙傛暟锛歿}", result);
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        String code = (String) jsonObject.toString();
+        return code;
+    }
+    public String encode(String arg) {
+        if (arg == null) {
+            arg = "";
+        }
+        MessageDigest md5 = null;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+            md5.update(arg.getBytes("UTF-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return toHex(md5.digest());
+    }
 }

--
Gitblit v1.9.3