From 41ac1512f52f7670fff3200168b8bdd23c0b6489 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 20 十一月 2026 09:12:22 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java |  248 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 240 insertions(+), 8 deletions(-)

diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
index 3f2df0b..b016e06 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.enums.ImportFlagEnum;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.service.IConfigService;
 import com.ruoyi.satisfaction.api.SatisfactionFacade;
@@ -279,6 +280,14 @@
     /** 浜屾闅忚鐢熸垚閿佸墠缂�锛岄槻姝㈠悓涓�鍘熶换鍔″苟鍙戠敓鎴愬鏉′簩娆¢殢璁� */
     private static final String AGAIN_LOCK_KEY_PREFIX = "smartor:again:lock:";
     private static final long AGAIN_LOCK_SECONDS = 30L;
+
+    /**
+     * /getSfStatisticsHyperlink 涓嬮捇绫诲瀷鍚庣紑锛氥�屽嚭闄汉娆�/鏃犻渶闅忚/搴旈殢璁裤�嶆寜銆屾櫘閫�/鏃ラ棿銆嶇粏鍒嗗悗鐨勫垪锛�
+     * 鍓嶇浼� {@code <鍒楀悕>DaytimeInfo} / {@code <鍒楀悕>NormalInfo}锛堣
+     * {@code applyDaytimeHyperLinkInfoType}锛夈�傛敼杩欓噷绛変簬鏀瑰墠鍚庣绾﹀畾銆�
+     */
+    private static final String HYPERLINK_DAYTIME_SUFFIX = "Daytime";
+    private static final String HYPERLINK_NORMAL_SUFFIX = "Normal";
 
     /**
      * 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級
@@ -1870,6 +1879,25 @@
                             serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                         }
                     }
+                    // 鐐逛綅琛岋紙2026-11锛宎ppltype=7锛夛細绉戝 / 鐥呭尯 / 鐐逛綅鍦� service_taskdept 閲屾槸
+                    // **鍚勮嚜鐙珛鐨勮**锛屽彲浠ュ叡瀛樹篃鍙互涓嶅叡瀛� 鈥斺�� 鎵�浠ョ偣浣嶈鏄�"棰濆杩藉姞"锛�
+                    // 涓嶆浛鎹笂闈㈢殑绉戝/鐥呭尯琛屻�傜偣浣嶈鐨� dept_code/dept_name 鐣欑┖锛岀紪鐮佸彧钀� point_location銆�
+                    if ("7".equals(serviceTaskVO.getAppltype())) {
+                        String pointLocation = firstNonBlank(serviceTaskVO.getPointLocation(),
+                                serviceTask.getPointLocation());
+                        if (StringUtils.isNotEmpty(pointLocation)) {
+                            ServiceTaskdept pointDept = new ServiceTaskdept();
+                            pointDept.setTaskId(serviceTask.getTaskid());
+                            pointDept.setTaskName(serviceTask.getTaskName());
+                            pointDept.setOrgid(serviceTask.getOrgid());
+                            pointDept.setLongtask(serviceTask.getLongTask() == null ? null
+                                    : Long.valueOf(serviceTask.getLongTask()));
+                            pointDept.setServiceType(serviceTaskVO.getServiceType());
+                            pointDept.setDeptType("3");
+                            pointDept.setPointLocation(pointLocation);
+                            serviceTaskdeptService.insertServiceTaskdept(pointDept);
+                        }
+                    }
                 }
             }
 //闀挎湡浠诲姟锛屼篃鍏佽鍔犱汉浜�
@@ -2249,6 +2277,27 @@
                     scheduleVO.setOplevelCodes(serviceTaskVO.getOplevelcode());
                     scheduleVO.setCreateBy(serviceTask.getUpdateBy());
                     serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
+                } else if (serviceTaskVO.getAppltype().equals("7")) {
+                    // 鎸夌偣浣嶏紙鍚屽痉闇�姹傦級锛氬厛杞垹璇ヤ换鍔℃棫鐨� dept_type='3' 琛岋紝鍐嶆寜鍏ュ弬閲嶅缓
+                    //   锛堜笌绉戝/鐥呭尯銆屽厛鍒犲悗鎻掋�嶅悓鍙e緞锛涚偣浣嶈 dept_code/dept_name 鐣欑┖锛�
+                    ServiceTaskdept oldPoint = new ServiceTaskdept();
+                    oldPoint.setTaskId(serviceTask.getTaskid());
+                    oldPoint.setDeptType("3");
+                    serviceTaskdeptService.deleteServiceTaskdeptByTaskId(oldPoint);
+                    String pointLocation = StringUtils.isNotEmpty(serviceTaskVO.getPointLocation())
+                            ? serviceTaskVO.getPointLocation() : serviceTask.getPointLocation();
+                    if (StringUtils.isNotEmpty(pointLocation)) {
+                        ServiceTaskdept pointDept = new ServiceTaskdept();
+                        pointDept.setTaskId(serviceTask.getTaskid());
+                        pointDept.setTaskName(serviceTask.getTaskName());
+                        pointDept.setOrgid(serviceTaskVO.getOrgid());
+                        pointDept.setLongtask(serviceTask.getLongTask() == null ? null
+                                : Long.valueOf(serviceTask.getLongTask()));
+                        pointDept.setServiceType(serviceTaskVO.getServiceType());
+                        pointDept.setDeptType("3");
+                        pointDept.setPointLocation(pointLocation);
+                        serviceTaskdeptService.insertServiceTaskdept(pointDept);
+                    }
                 }
             }
             if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -2832,6 +2881,8 @@
             //鍑洪櫌浜烘
             serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
             for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+                //鏅��/鏃ラ棿缁嗗垎锛堝嚭闄汉娆°�佹棤闇�闅忚浜烘銆佸簲闅忚浜烘锛�
+                applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
                 //鏃犻渶闅忚浜烘
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                     serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3128,6 +3179,47 @@
     }
 
     /**
+     * 鎶娿�屽嚭闄汉娆� / 鏃犻渶闅忚浜烘 / 搴旈殢璁夸汉娆°�嶆寜銆屾櫘閫� / 鏃ラ棿銆嶇粏鍒嗙疮鍔犮��
+     * <p>
+     * 鍒ゅ畾渚濇嵁锛歿@code service_subtask.importance_flag_code}锛堝缓浠诲姟鏃朵粠 {@code pat_med_inhosp}
+     * 鎷锋潵鐨勫揩鐓э紝鐜板満瀛樹腑鏂囨弿杩般�屾棩闂存墜鏈�嶃�屾棩闂磋瘖鐤椼�嶏紝涔熸湁鐜瀛� {@code FH0165.01/02}锛夛紝
+     * 鍙e緞闆嗕腑鍦� {@link ImportFlagEnum#isDaytime(String)}銆�
+     * <p>
+     * 涓変釜鏂规硶锛坽@link #getStatistic}銆亄@link #getStatisticFirst}銆亄@link #getStatisticAgain}锛�
+     * 鐨勫師濮嬬疮鍔犺鍒欏畬鍏ㄤ竴鑷达紝鎵�浠ヨ繖閲屽彧鍐欎竴浠斤紝涓夊寰幆浣撳悇璋冧竴琛屽嵆鍙��
+     * 淇濊瘉鎭掔瓑寮忥細鏅�� + 鏃ラ棿 == 鍘熸�婚噺瀛楁銆�
+     *
+     * @param statistic       褰撳墠鍒嗙粍鐨勭粺璁$粨鏋滐紙绱姞鐩爣锛�
+     * @param serviceSubtask  褰撳墠鏄庣粏琛�
+     */
+    private void applyDaytimeSplit(ServiceSubtaskStatistic statistic, ServiceSubtask serviceSubtask) {
+        if (statistic == null || serviceSubtask == null) {
+            return;
+        }
+        boolean daytime = ImportFlagEnum.isDaytime(serviceSubtask.getImportanceFlagCode());
+        //鍑洪櫌浜烘锛氭瘡涓�琛屾槑缁嗛兘绠� 1 浜烘锛堜笌 statistic.setDischargeCount(list.size()) 鍚屽彛寰勶級
+        if (daytime) {
+            statistic.setDischargeCountDaytime(statistic.getDischargeCountDaytime() + 1);
+        } else {
+            statistic.setDischargeCountNormal(statistic.getDischargeCountNormal() + 1);
+        }
+        //鏃犻渶闅忚浜烘锛坰endstate = 4锛�/ 搴旈殢璁夸汉娆★紙sendstate != 4锛夛細涓庡師鎬婚噺瀛楁瀹屽叏鍚屼竴鍒ゅ畾
+        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
+            if (daytime) {
+                statistic.setNonFollowUpDaytime(statistic.getNonFollowUpDaytime() + 1L);
+            } else {
+                statistic.setNonFollowUpNormal(statistic.getNonFollowUpNormal() + 1L);
+            }
+        } else if (serviceSubtask.getSendstate() != null) {
+            if (daytime) {
+                statistic.setFollowUpNeededDaytime(statistic.getFollowUpNeededDaytime() + 1L);
+            } else {
+                statistic.setFollowUpNeededNormal(statistic.getFollowUpNeededNormal() + 1L);
+            }
+        }
+    }
+
+    /**
      * 鏄惁灞炰簬銆屽強鏃堕殢璁裤�嶏細闅忚宸插畬鎴愪笖瀹屾垚鏃剁姸鎬佷负姝e父瀹屾垚锛堟湭瓒呮椂锛夈��
      * <p>
      * finish_state锛�1-姝e父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛屽彧鏈� 1 璁″叆鍙婃椂闅忚銆�
@@ -3223,6 +3315,8 @@
 
         for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
             applyFirstFollowUpExtraStatistics(serviceSubtaskStatistic, serviceSubtask);
+            //鏅��/鏃ラ棿缁嗗垎锛堝嚭闄汉娆°�佹棤闇�闅忚浜烘銆佸簲闅忚浜烘锛�
+            applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
             //鏃犻渶闅忚浜烘
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                 serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3397,6 +3491,8 @@
         serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
         for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
             applyAgainFollowUpExtraStatistics(serviceSubtaskStatistic, serviceSubtask);
+            //鏅��/鏃ラ棿缁嗗垎锛堝嚭闄汉娆°�佹棤闇�闅忚浜烘銆佸簲闅忚浜烘锛�
+            applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
             //鏃犻渶闅忚浜烘
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                 serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3867,6 +3963,14 @@
         serviceSubtaskCountReq.setFinishState(null);
         serviceSubtaskCountReq.setSuggest(null);
 
+        //2026-11 鏂板锛氬嚭闄汉娆� / 鏃犻渶闅忚浜烘 / 搴旈殢璁夸汉娆� 鎸夈�屾櫘閫� / 鏃ラ棿銆嶇粏鍒嗗悗鐨勪笅閽汇��
+        //鏀惧湪娓呯┖鍔ㄤ綔涔嬪悗銆佽�� switch 涔嬪墠锛歨elper 鑷繁浼氭妸 sendstates 璁惧洖鍘汇��
+        Boolean daytimeResult = applyDaytimeHyperLinkInfoType(serviceSubtaskCountReq, hyperLinkInfoType);
+        if (daytimeResult != null) {
+            //true-宸叉寜銆屾櫘閫�/鏃ラ棿銆嶆嫾濂芥潯浠讹紱false-璁ゅ嚭鏄櫘閫�/鏃ラ棿涓嬮捇浣嗕笉璁よ瘑鏄摢涓�鍒� 鈫� 杩斿洖绌烘槑缁�
+            return daytimeResult;
+        }
+
         switch (hyperLinkInfoType) {
             case "dischargeCountInfo":
                 break;
@@ -4085,6 +4189,75 @@
                 break;
         }
         return true;
+    }
+
+    /**
+     * 銆屽嚭闄汉娆� / 鏃犻渶闅忚浜烘 / 搴旈殢璁夸汉娆°�嶆寜銆屾櫘閫� / 鏃ラ棿銆嶇粏鍒嗗悗鐨勪笅閽荤被鍨嬭В鏋愩��
+     * <p>
+     * 鍓嶇浼犵殑 {@code hyperLinkInfoType} 褰㈠ {@code <鍒楀悕><Daytime|Normal>Info}锛屽疄娴嬩緥濡傦細
+     * <ul>
+     *   <li>{@code dischargeCountDaytimeInfo} 鈥斺�� 鍑洪櫌浜烘-鏃ラ棿</li>
+     *   <li>{@code dischargeCountNormalInfo} 鈥斺�� 鍑洪櫌浜烘-鏅��</li>
+     *   <li>{@code nonFollowUpDaytimeInfo} / {@code nonFollowUpNormalInfo} 鈥斺�� 鏃犻渶闅忚浜烘</li>
+     *   <li>{@code followUpNeededDaytimeInfo} / {@code followUpNeededNormalInfo} 鈥斺�� 搴旈殢璁夸汉娆�</li>
+     * </ul>
+     * 鍚庣紑涔熸帴鍙椾笉甯� {@code Info} 鐨勫啓娉曪紙{@code ...Daytime} / {@code ...Normal}锛夛紝
+     * 鍓嶇紑棰濆鍏煎 {@code nonFollowUpAll} / {@code followUpNeededAll}锛堝榻愯�佺殑
+     * {@code nonFollowUpInfo} / {@code followUpNeededAllInfo} 鍛藉悕涔犳儻锛夈��
+     * <p>
+     * 涓夊垪涓庢眹鎬诲彛寰勪竴涓�瀵瑰簲锛�
+     * <ul>
+     *   <li>鍑洪櫌浜烘 = 璇ュ垎缁勫叏閮ㄦ槑缁嗚锛堜笉闄� sendstate锛夛紝瀵瑰簲 {@code dischargeCountInfo}锛�</li>
+     *   <li>鏃犻渶闅忚浜烘 = {@code sendstate = 4}锛屽搴� {@code nonFollowUpInfo}锛�</li>
+     *   <li>搴旈殢璁夸汉娆� = {@code sendstate in (1,2,3,5,6,7)}锛屽搴� {@code followUpNeededAllInfo}銆�</li>
+     * </ul>
+     * 銆屾櫘閫�/鏃ラ棿銆嶆湰韬敱 {@link ServiceSubtaskCountReq#getDaytimeOnly()} 涓嬫帹鍒� SQL
+     * 锛堣 {@code ServiceSubtaskMapper.xml#getSfStatisticsHyperlink}锛夛紝鍒ゅ畾鍙e緞涓庢眹鎬讳晶
+     * {@link ImportFlagEnum#isDaytime(String)} 瀹屽叏涓�鑷淬��
+     * <p>
+     * 娉ㄦ剰锛氳�� switch 鐨� {@code default} 鏄�"浠�涔堥兘涓嶈"鈥斺�斿嵆璁や笉鍑虹殑 type 浼氶��鍖栨垚"鏃犳潯浠跺叏閲忔槑缁�"锛�
+     * 鍓嶇鐐规柊鍒楀嵈鎷垮埌鍏ㄩ噺鏁版嵁灏辨槸杩欎箞鏉ョ殑銆傛墍浠ヨ繖閲屼竴鏃﹁鍑烘槸鏅��/鏃ラ棿涓嬮捇銆佷絾鍒楀悕瀵逛笉涓婏紝
+     * 鐩存帴杩斿洖 {@code false}锛堟槑缁嗕负绌� + 鍛婅鏃ュ織锛夛紝涓嶅啀璁╁畠鎺夎繘 default銆�
+     *
+     * @return {@code null}-涓嶆槸鏅��/鏃ラ棿绫诲瀷鐨勪笅閽伙紝浜ゅ洖鑰� switch 澶勭悊锛�
+     * {@code true}-鏉′欢宸叉嫾濂斤紱{@code false}-涓嶈璇嗚鍒楋紝搴旇繑鍥炵┖鏄庣粏
+     */
+    private Boolean applyDaytimeHyperLinkInfoType(ServiceSubtaskCountReq serviceSubtaskCountReq, String hyperLinkInfoType) {
+        //缁熶竴鍘绘帀缁撳熬鐨� Info锛岃繖鏍� xxxDaytimeInfo / xxxDaytime 涓ょ鍐欐硶閮借兘璁�
+        String type = hyperLinkInfoType.endsWith("Info")
+                ? hyperLinkInfoType.substring(0, hyperLinkInfoType.length() - "Info".length())
+                : hyperLinkInfoType;
+        boolean daytime;
+        String base;
+        if (type.endsWith(HYPERLINK_DAYTIME_SUFFIX)) {
+            daytime = true;
+            base = type.substring(0, type.length() - HYPERLINK_DAYTIME_SUFFIX.length());
+        } else if (type.endsWith(HYPERLINK_NORMAL_SUFFIX)) {
+            daytime = false;
+            base = type.substring(0, type.length() - HYPERLINK_NORMAL_SUFFIX.length());
+        } else {
+            return null;
+        }
+        Integer daytimeOnly = daytime ? 1 : 0;
+        if ("dischargeCount".equals(base)) {
+            //鍑洪櫌浜烘锛氫笉闄� sendstate锛屼笌 getStatistic 鐨� dischargeCount 鍙e緞涓�鑷�
+            serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
+            return true;
+        }
+        if ("nonFollowUp".equals(base) || "nonFollowUpAll".equals(base)) {
+            //鏃犻渶闅忚浜烘锛歴endstate = 4锛屼笌 nonFollowUpInfo 鍙e緞涓�鑷�
+            serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
+            serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
+            return true;
+        }
+        if ("followUpNeeded".equals(base) || "followUpNeededAll".equals(base)) {
+            //搴旈殢璁夸汉娆★細sendstate != 4锛屼笌 followUpNeededAllInfo 鍙e緞涓�鑷�
+            serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
+            serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
+            return true;
+        }
+        log.warn("getSfStatisticsHyperlink-鏅��/鏃ラ棿涓嬮捇鐨勫垪鍚嶆棤娉曡瘑鍒紝杩斿洖绌烘槑缁嗭細hyperLinkInfoType={}", hyperLinkInfoType);
+        return false;
     }
 
     /**
@@ -4548,6 +4721,13 @@
         total.setNonFollowUp(0L);
         total.setFilterCount(0L);
         total.setFollowUpNeeded(0L);
+        //2026-11锛氭櫘閫�/鏃ラ棿缁嗗垎锛堜笌涓婃柟涓変釜鎬婚噺瀛楁鎴愬绱姞锛�
+        total.setDischargeCountNormal(0);
+        total.setDischargeCountDaytime(0);
+        total.setNonFollowUpNormal(0L);
+        total.setNonFollowUpDaytime(0L);
+        total.setFollowUpNeededNormal(0L);
+        total.setFollowUpNeededDaytime(0L);
         total.setNeedFollowUp(0L);
         total.setPendingFollowUp(0L);
         total.setFollowUpSuccess(0L);
@@ -4593,6 +4773,13 @@
             total.setNonFollowUp(total.getNonFollowUp() + (stat.getNonFollowUp() != null ? stat.getNonFollowUp() : 0L));
             total.setFilterCount(total.getFilterCount() + (stat.getFilterCount() != null ? stat.getFilterCount() : 0L));
             total.setFollowUpNeeded(total.getFollowUpNeeded() + (stat.getFollowUpNeeded() != null ? stat.getFollowUpNeeded() : 0L));
+            //2026-11锛氭櫘閫�/鏃ラ棿缁嗗垎锛屼笌涓婃柟涓変釜鎬婚噺瀛楁鍚屾簮绱姞锛堟櫘閫� + 鏃ラ棿 == 鎬婚噺锛�
+            total.setDischargeCountNormal(total.getDischargeCountNormal() + (stat.getDischargeCountNormal() != null ? stat.getDischargeCountNormal() : 0));
+            total.setDischargeCountDaytime(total.getDischargeCountDaytime() + (stat.getDischargeCountDaytime() != null ? stat.getDischargeCountDaytime() : 0));
+            total.setNonFollowUpNormal(total.getNonFollowUpNormal() + (stat.getNonFollowUpNormal() != null ? stat.getNonFollowUpNormal() : 0L));
+            total.setNonFollowUpDaytime(total.getNonFollowUpDaytime() + (stat.getNonFollowUpDaytime() != null ? stat.getNonFollowUpDaytime() : 0L));
+            total.setFollowUpNeededNormal(total.getFollowUpNeededNormal() + (stat.getFollowUpNeededNormal() != null ? stat.getFollowUpNeededNormal() : 0L));
+            total.setFollowUpNeededDaytime(total.getFollowUpNeededDaytime() + (stat.getFollowUpNeededDaytime() != null ? stat.getFollowUpNeededDaytime() : 0L));
             total.setNeedFollowUp(total.getNeedFollowUp() + (stat.getNeedFollowUp() != null ? stat.getNeedFollowUp() : 0L));
             total.setPendingFollowUp(total.getPendingFollowUp() + (stat.getPendingFollowUp() != null ? stat.getPendingFollowUp() : 0L));
             total.setFollowUpSuccess(total.getFollowUpSuccess() + (stat.getFollowUpSuccess() != null ? stat.getFollowUpSuccess() : 0L));
@@ -5456,16 +5643,46 @@
         String ip = localIP;
         ServiceTask serviceTask = new ServiceTask();
         serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceTaskVo.getTaskid());
+        if (ObjectUtils.isEmpty(serviceTask)) {
+            // 浠诲姟涓嶅瓨鍦� 鈫� 涓嶅彲鑳芥湁 data锛岀洿鎺ユ姏涓氬姟寮傚父锛堟帴鍙e眰浼氳浆鎴� code=500锛�
+            throw new BaseException("鎵爜鐢熸垚浠诲姟澶辫触锛氫换鍔′笉瀛樺湪鎴栧凡鍒犻櫎锛坱askid=" + serviceTaskVo.getTaskid() + "锛�");
+        }
         if (ObjectUtils.isNotEmpty(serviceTask)) {
             try {
                 ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
-                if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
-                    serviceTaskdept.setDeptType("1");
-                    serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
-                }
-                if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
+                // 缁村害锛堢瀹�/鐥呭尯/鐐逛綅锛夌敱浠诲姟鐨� appltype 鍐冲畾锛�1=绉戝銆�2=鐥呭尯銆�7=鐐逛綅銆�
+                //   涓夌缁村害鍦� service_taskdept 閲屾槸**鍚勮嚜鐙珛鐨勮**锛堝悇鑷殑鍒楋級锛屽彲浠ュ叡瀛樸�佷篃鍙互涓嶅叡瀛橈紱
+                //   浣嗘煡琛屾椂蹇呴』鍙甫涓�涓淮搴� 鈥斺�� 鍚﹀垯浼氱敤 A 缁村害鐨勭紪鐮佸幓鎾� B 缁村害鐨勮锛�
+                //   鑰岀偣浣嶈鐨� dept_code 鏈潵灏辨槸绌虹殑銆�
+                String appltype = serviceTask.getAppltype();
+                if ("7".equals(appltype)) {
+                    serviceTaskdept.setDeptType("3");
+                    serviceTaskdept.setPointLocation(firstNonBlank(serviceTaskVo.getPointLocation(),
+                            serviceTask.getPointLocation()));
+                } else if ("2".equals(appltype)) {
                     serviceTaskdept.setDeptType("2");
-                    serviceTaskdept.setDeptCode(serviceTaskVo.getLeavehospitaldistrictcode());
+                    // 浠诲姟涓婄殑绉戝/鐥呭尯鍙兘鏄�楀彿澶氶�夛紝鏌� service_taskdept 瑕佺敤鍗曞�硷紙鍙栫涓�涓級
+                    serviceTaskdept.setDeptCode(firstNonBlank(serviceTaskVo.getLeavehospitaldistrictcode(),
+                            firstValue(serviceTask.getLeavehospitaldistrictcode())));
+                } else if ("1".equals(appltype)) {
+                    serviceTaskdept.setDeptType("1");
+                    serviceTaskdept.setDeptCode(firstNonBlank(serviceTaskVo.getDeptcode(),
+                            firstValue(serviceTask.getDeptcode())));
+                } else {
+                    // appltype 涓虹┖鐨勫巻鍙蹭换鍔★細娌跨敤鏀归�犲墠鐨勫彛寰勶紙绉戝 鈫� 鐥呭尯锛屽悗鍐欑殑瑕嗙洊鍏堝啓鐨勶級锛�
+                    // 鐐逛綅浣滀负绗笁缁达紝鍙湪浼犱簡鐐逛綅鏃惰ˉ涓娿��
+                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
+                        serviceTaskdept.setDeptType("1");
+                        serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
+                    }
+                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
+                        serviceTaskdept.setDeptType("2");
+                        serviceTaskdept.setDeptCode(serviceTaskVo.getLeavehospitaldistrictcode());
+                    }
+                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getPointLocation())) {
+                        serviceTaskdept.setDeptType("3");
+                        serviceTaskdept.setPointLocation(serviceTaskVo.getPointLocation());
+                    }
                 }
                 serviceTaskdept.setServiceType(serviceTask.getServiceType());
                 serviceTaskdept.setOrgid(serviceTask.getOrgid());
@@ -5476,6 +5693,7 @@
                     PatArchive patArchive = new PatArchive();
                     patArchive.setId(999999999L);
                     patArchive.setName("铏氭嫙鎮h��");
+                    patArchive.setTelcode(serviceTaskVo.getPhone());
                     //灏佽serviceSubtask
                     ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, serviceTaskdepts.get(0), patArchive);
                     int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -5502,10 +5720,21 @@
                         iServiceOutPathService.updateServiceOutPath(serviceOutPath);
 
                     }
+                } else {
+                    // 閰嶇疆缂哄け灞炪�屼笟鍔″彲棰勬湡銆嶆儏鍐碉細甯︿笂鎺掓煡淇℃伅鎶涘嚭鍘伙紙涓嶅悶锛夛紝
+                    // 鎺ュ彛灞傛嵁姝よ繑鍥� code=500 + 鏄庣‘ msg锛岄伩鍏嶃��200 + 绌� data銆嶃��
+                    throw new BaseException("鎵爜鐢熸垚浠诲姟澶辫触锛氭湭鍖归厤鍒颁换鍔$淮搴﹂厤缃紙taskid=" + serviceTaskVo.getTaskid()
+                            + "锛宎ppltype=" + appltype
+                            + "锛宒eptType=" + serviceTaskdept.getDeptType()
+                            + "锛宒eptCode=" + serviceTaskdept.getDeptCode()
+                            + "锛宲ointLocation=" + serviceTaskdept.getPointLocation() + "锛�");
                 }
+            } catch (BaseException be) {
+                // 鈿狅笍 蹇呴』鎺掑湪 catch (Exception) 涔嬪墠锛欱aseException 鏄� RuntimeException锛�
+                //    鍚﹀垯鍒氭姏鍑虹殑涓氬姟寮傚父浼氳涓嬮潰鏁存鍚炴帀锛屾帴鍙e張鍙樻垚 200 + 绌� data銆�
+                throw be;
             } catch (Exception e) {
-                e.printStackTrace();
-                log.error("銆愭壂鐮佺敓鎴愪换鍔°�戝鐞嗗紓甯革細{}", e.getMessage());
+                log.error("銆愭壂鐮佺敓鎴愪换鍔°�戝鐞嗗紓甯革細taskid={}锛寋}", serviceTaskVo.getTaskid(), e.getMessage(), e);
             }
         }
         return content;
@@ -5523,6 +5752,9 @@
         if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("1")) {
             serviceSubtask.setLeaveldeptcode(serviceTaskdept.getDeptCode());
             serviceSubtask.setLeaveldeptname(serviceTaskdept.getDeptName());
+        } else if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("3")) {
+            // 鐐逛綅琛岋紙dept_type='3'锛夛細dept_code/dept_name 涓虹┖锛岀偣浣嶅彧钀� point_location
+            serviceSubtask.setPointLocation(serviceTaskdept.getPointLocation());
         } else {
             serviceSubtask.setLeavehospitaldistrictcode(serviceTaskdept.getDeptCode());
             serviceSubtask.setLeavehospitaldistrictname(serviceTaskdept.getDeptName());

--
Gitblit v1.9.3