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/domain/ServiceSubtaskStatistic.java         |   35 +++++++
 ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java    |    6 +
 ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java |  148 +++++++++++++++++++++++++++++
 ruoyi-common/src/main/java/com/ruoyi/common/enums/ImportFlagEnum.java               |   39 +++++++
 ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml                  |   32 ++++++
 ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java          |   12 ++
 ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceTask.java                     |   12 +-
 7 files changed, 275 insertions(+), 9 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ImportFlagEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ImportFlagEnum.java
index cdb2f65..9e7e6b1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ImportFlagEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ImportFlagEnum.java
@@ -32,6 +32,17 @@
      */
     DAY_SURGERY("FH0165.01", "鏃ラ棿鎵嬫湳");
 
+    /**
+     * 銆屾棩闂淬�嶅垽瀹氬叧閿瓧銆�
+     * <p>
+     * 涓枃鎻忚堪鍙e緞鐨勫彇鍊硷紙{@code 鏃ラ棿鎵嬫湳} / {@code 鏃ラ棿璇婄枟}锛夐兘鍚繖涓瘝锛岀敤瀹冨仛鍖呭惈鍒ゆ柇鏈�瀹芥澗涔熸渶绋筹細
+     * 灏嗘潵鏋氫妇鏂板銆屾棩闂村寲鐤椼�嶄箣绫荤殑鎻忚堪涔熻嚜鍔ㄧ畻鏃ラ棿銆�
+     * <p>
+     * 鈿狅笍 SQL 渚э紙{@code ServiceSubtaskMapper.xml} 鐨� {@code getSfStatisticsHyperlink} 閲�
+     * 銆屾櫘閫�/鏃ラ棿銆嶄笅閽绘潯浠讹級鐢ㄧ殑鏄悓涓�涓瓧闈㈤噺锛屾敼杩欓噷蹇呴』鍚屾鏀归偅閲岋紝鍚﹀垯姹囨�绘暟瀛椾笌涓嬮捇鏄庣粏浼氬涓嶄笂銆�
+     */
+    public static final String DAYTIME_KEYWORD = "鏃ラ棿";
+
     private String code;
     private String desc;
 
@@ -64,6 +75,34 @@
         return null;
     }
 
+    /**
+     * 鍒ゆ柇銆岄噸瑕佹�ф爣璁般�嶆槸鍚﹀睘浜庛�屾棩闂淬�嶃��
+     * <p>
+     * 鍒ゅ畾鍙e緞锛堜袱绉嶅彛寰勯兘瑕佸厹锛屽洜涓哄悓涓�鍒楀湪涓嶅悓鐜瀛樼殑涓滆タ涓嶄竴鏍凤級锛�
+     * <ul>
+     *   <li><b>涓枃鎻忚堪鍙e緞</b>锛氬惈 {@link #DAYTIME_KEYWORD}锛堝嵆 {@code 鏃ラ棿鎵嬫湳} / {@code 鏃ラ棿璇婄枟}锛�
+     *       鐜板満搴撳瓨鐨勫氨鏄繖绉嶏紝鐢遍噰闆嗙 {@code ImportFlagEnum#getDescByCode} 杞嚭鏉ワ級锛�</li>
+     *   <li><b>鏋氫妇缂栫爜鍙e緞</b>锛歿@code FH0165.01} / {@code FH0165.02}銆�</li>
+     * </ul>
+     * 澶氬�煎満鏅紙濡� {@code 鏃�,鏃ラ棿鎵嬫湳}銆亄@code 鏃ラ棿璇婄枟,鏃ラ棿鎵嬫湳}锛屽簱閲屾湁瀹炴祴鏁版嵁锛夋寜
+     * <b>鈥滃寘鍚嵆鏃ラ棿鈥�</b>澶勭悊銆傚洜姝よ繖閲岀粺涓�鐢ㄥ寘鍚垽鏂紝涓嶈姹傛暣鍊肩浉绛夈��
+     * <p>
+     * {@code null} / 绌轰覆 / 鍏跺畠鍊硷紙{@code 鏃爙銆亄@code 鐗圭害浜哄憳}銆亄@code 绂讳紤浜哄憳}鈥︼級
+     * 涓�寰�**涓嶆槸**鏃ラ棿锛屽嵆褰掑叆銆屾櫘閫氥�嶃��
+     *
+     * @param importanceFlagCode 閲嶈鎬ф爣璁板師鍊硷紙鍙兘涓轰腑鏂囨弿杩般�佺紪鐮佹垨澶氬�奸�楀彿鎷兼帴锛�
+     * @return true-鏃ラ棿锛沠alse-鏅��
+     */
+    public static boolean isDaytime(String importanceFlagCode) {
+        if (importanceFlagCode == null || importanceFlagCode.trim().isEmpty()) {
+            return false;
+        }
+        if (importanceFlagCode.contains(DAYTIME_KEYWORD)) {
+            return true;
+        }
+        return importanceFlagCode.contains(DAY_SURGERY.getCode()) || importanceFlagCode.contains(DAY_TREATMENT.getCode());
+    }
+
     public String getCode() {
         return code;
     }
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
index 8e2e269..9651585 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
@@ -598,7 +598,11 @@
         serviceSubtaskCountReq.setPageNum(null);
         serviceSubtaskCountReq.setPageSize(null);
         List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq);
-        return getDataTable4(CollectionUtils.isEmpty(sfStatistics) ? sfStatistics.size() : 0, serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
+        // 淇锛氬師鏉ヨ繖閲屾妸鍚屼竴涓粺璁℃煡璇㈣繛璋冧袱娆★紙绗竴娆$殑缁撴灉琚洿鎺ヤ涪寮冿級锛�
+        // 绛変簬姣忔璇锋眰鐧借窇涓�閬嶃�屽叏閲忔槑缁嗗洖鍐呭瓨绱姞銆嶃�傜幇鍦ㄥ鐢ㄥ悓涓�娆℃煡璇㈢粨鏋溿��
+        // 娉ㄦ剰 total 鐨勫彇鍊艰〃杈惧紡淇濇寔鍘熸牱锛坄isEmpty ? size() : 0` 鎭掍负 0锛屽睘鏃㈡湁琛屼负锛夛紝
+        // 瑕佹敼鎴� sfStatistics.size() 闇�涓庡墠绔‘璁ゅ悗鍐嶅姩銆�
+        return getDataTable4(CollectionUtils.isEmpty(sfStatistics) ? sfStatistics.size() : 0, sfStatistics);
     }
 
     // =====================================================================================
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
index 9204983..2d09f5b 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskCountReq.java
@@ -108,6 +108,18 @@
     @ApiModelProperty(value = "缁х画鏍囪瘑:1 娌�  2鏈�")
     private Integer continueFlag;
 
+    /**
+     * 銆屾櫘閫� / 鏃ラ棿銆嶈繃婊わ細閰嶅悎 /getSfStatistics 鏂板鐨� *Normal / *Daytime 缁嗗垎瀛楁鍋氫笅閽汇��
+     * <p>
+     * 1-鍙湅鏃ラ棿锛�0-鍙湅鏅�氾紱涓嶄紶-涓嶉檺銆�
+     * 鍒ゅ畾鍙e緞瑙� {@code com.ruoyi.common.enums.ImportFlagEnum#isDaytime}锛氭棩闂� = importance_flag_code
+     * 鍚�屾棩闂淬�嶏紙涓枃鎻忚堪鍙e緞锛夋垨鍚� FH0165.01 / FH0165.02锛堟灇涓剧紪鐮佸彛寰勶級锛涘叾浣欙紙鍚� NULL锛変负鏅�氥��
+     * <p>
+     * 鐩墠鍙湪 {@code getSfStatisticsHyperlink}锛堟槑缁嗕笅閽伙級閲岀敓鏁堛��
+     */
+    @ApiModelProperty(value = "鏅��/鏃ラ棿杩囨护锛�1-鏃ラ棿 0-鏅�� 涓嶄紶-涓嶉檺")
+    private Integer daytimeOnly;
+
     @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date continueTimeNow;
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
index 43fc52d..31b20a7 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskStatistic.java
@@ -123,6 +123,41 @@
     @Excel(name = " 搴旈殢璁夸汉娆� ")
     private Long followUpNeeded = 0L;
 
+    /*
+     * 2026-11 鏂板锛氬嚭闄汉娆� / 鏃犻渶闅忚浜烘 / 搴旈殢璁夸汉娆� 鍚勮嚜鍐嶇粏鍒嗐�屾櫘閫氥�嶃�屾棩闂淬�嶃��
+     *   鍒ゅ畾鍙e緞锛歴ervice_subtask.importance_flag_code锛堝缓浠诲姟鏃朵粠 pat_med_inhosp 鎷锋潵鐨勫揩鐓э級锛�
+     *             璇﹁ com.ruoyi.common.enums.ImportFlagEnum#isDaytime銆�
+     *   鎭掔瓑寮忥紙鍙綔涓烘牎楠岀偣锛夛細
+     *     dischargeCountNormal + dischargeCountDaytime == dischargeCount
+     *     nonFollowUpNormal     + nonFollowUpDaytime     == nonFollowUp
+     *     followUpNeededNormal  + followUpNeededDaytime  == followUpNeeded
+     *   鍘熸潵鐨勪笁涓�婚噺瀛楁淇濇寔涓嶅彉锛屽墠绔笉鏀逛篃涓嶄細鍧忥紱杩� 6 涓槸绾閲忋��
+     */
+
+    @ApiModelProperty(value = "鍑洪櫌浜烘-鏅�氾紙闈炴棩闂达級")
+    @Excel(name = " 鍑洪櫌浜烘-鏅�� ")
+    private Integer dischargeCountNormal = 0;
+
+    @ApiModelProperty(value = "鍑洪櫌浜烘-鏃ラ棿锛坕mportanceFlagCode 鍚棩闂存墜鏈�/鏃ラ棿璇婄枟锛�")
+    @Excel(name = " 鍑洪櫌浜烘-鏃ラ棿 ")
+    private Integer dischargeCountDaytime = 0;
+
+    @ApiModelProperty(value = "鏃犻渶闅忚浜烘-鏅�氾紙闈炴棩闂达級")
+    @Excel(name = " 鏃犻渶闅忚浜烘-鏅�� ")
+    private Long nonFollowUpNormal = 0L;
+
+    @ApiModelProperty(value = "鏃犻渶闅忚浜烘-鏃ラ棿锛坕mportanceFlagCode 鍚棩闂存墜鏈�/鏃ラ棿璇婄枟锛�")
+    @Excel(name = " 鏃犻渶闅忚浜烘-鏃ラ棿 ")
+    private Long nonFollowUpDaytime = 0L;
+
+    @ApiModelProperty(value = "搴旈殢璁夸汉娆�-鏅�氾紙闈炴棩闂达級")
+    @Excel(name = " 搴旈殢璁夸汉娆�-鏅�� ")
+    private Long followUpNeededNormal = 0L;
+
+    @ApiModelProperty(value = "搴旈殢璁夸汉娆�-鏃ラ棿锛坕mportanceFlagCode 鍚棩闂存墜鏈�/鏃ラ棿璇婄枟锛�")
+    @Excel(name = " 搴旈殢璁夸汉娆�-鏃ラ棿 ")
+    private Long followUpNeededDaytime = 0L;
+
     @ApiModelProperty(value = "浜哄伐宸叉嫧閫氭�婚噺")
     @Excel(name = " 浜哄伐宸叉嫧閫氭�婚噺 ")
     private Long manuallyCalled = 0L;
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceTask.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceTask.java
index 0b03a04..cf83881 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceTask.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceTask.java
@@ -307,12 +307,12 @@
     @ApiModelProperty(value = "鍙戦�佺姸鎬侊細 1鍒涘缓   2鎵ц涓�   3 鏆傚仠   4缁堟  5瀹屾垚 ")
     private Long sendState;
 
-//    /**
-//     * 鏂囨湰鍙橀噺鍙傛暟
-//     */
-//    @Excel(name = " 鏂囨湰鍙橀噺鍙傛暟 ")
-//    @ApiModelProperty(value = "鏂囨湰鍙橀噺鍙傛暟 ")
-//    private String param;
+    /**
+     * 鎵嬫満鍙�
+     */
+    @Excel(name = " 鎵嬫満鍙� ")
+    @ApiModelProperty(value = "鎵嬫満鍙� ")
+    private String phone;
 
     /**
      * pageNum
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 58b73f4..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";
 
     /**
      * 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級
@@ -2872,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);
@@ -3168,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 璁″叆鍙婃椂闅忚銆�
@@ -3263,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);
@@ -3437,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);
@@ -3907,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;
@@ -4125,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;
     }
 
     /**
@@ -4588,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);
@@ -4633,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));
@@ -5546,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);
diff --git a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
index 656298d..3e67ff4 100644
--- a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
@@ -1955,7 +1955,10 @@
         continue_time_next,
         task_situation,
         finish_state,
-        is_manually_called
+        is_manually_called,
+        <!-- 2026-11锛�/getSfStatistics 鐨勩�屾櫘閫� / 鏃ラ棿銆嶇粏鍒嗚闈犺繖涓�鍒楀垽鏂紝
+             瑙� com.ruoyi.common.enums.ImportFlagEnum#isDaytime -->
+        importance_flag_code
         from service_subtask
         where 1=1
         and del_flag = 0
@@ -2721,7 +2724,9 @@
         remark,
         doctor_opinion,
         finish_state,
-        is_manually_called
+        is_manually_called,
+        <!-- 2026-11锛氫笅閽绘槑缁嗗垪琛ㄨ鑳芥樉绀恒�屾棩闂�/鏅�氥�嶏紝涓� getSfStatistics 鐨勭粏鍒嗗悓婧� -->
+        importance_flag_code
         from service_subtask
         where 1=1
         and del_flag = 0
@@ -2761,6 +2766,29 @@
                 #{serviceType}
             </foreach>
         </if>
+        <!--
+          2026-11锛氥�屾櫘閫� / 鏃ラ棿銆嶄笅閽昏繃婊わ紙瀵瑰簲 /getSfStatistics 鏂板鐨� *Normal / *Daytime 瀛楁锛夈��
+          鍒ゅ畾鍙e緞涓� Java 渚� ImportFlagEnum#isDaytime 瀹屽叏涓�鑷达細
+            鏃ラ棿 = importance_flag_code 鍚�屾棩闂淬�嶏紙涓枃鎻忚堪鍙e緞锛氭棩闂存墜鏈�/鏃ラ棿璇婄枟锛�
+                   鎴栧惈 FH0165.01 / FH0165.02锛堟灇涓剧紪鐮佸彛寰勶級锛涘鍊艰銆屽寘鍚嵆鏃ラ棿銆嶃��
+            鏅�� = 鍏朵綑鍏ㄩ儴锛屽惈 NULL / 绌轰覆 / 銆屾棤銆�/銆岀壒绾︿汉鍛樸��/銆岀浼戜汉鍛樸�嶃��
+          鍏ュ弬 daytimeOnly锛�1-鍙湅鏃ラ棿锛�0-鍙湅鏅�氾紱涓嶄紶-涓嶉檺銆�
+            鍓嶇涓嶇洿鎺ヤ紶瀹冿紝鑰屾槸浼� hyperLinkInfoType锛堝 dischargeCountDaytimeInfo /
+            nonFollowUpNormalInfo锛夛紝鐢� ServiceSubtaskServiceImpl#applyDaytimeHyperLinkInfoType
+            瑙f瀽鍚庤惤鍒拌繖閲岋紱鐩存帴浼� daytimeOnly 涔熸敮鎸併��
+          娉ㄦ剰 MySQL 鐨� NOT LIKE 瀵� NULL 杩斿洖 NULL锛屾墍浠ャ�屾櫘閫氥�嶅垎鏀鍏堟樉寮忔斁琛� IS NULL銆�
+        -->
+        <if test="daytimeOnly != null and daytimeOnly == 1">
+            AND (importance_flag_code LIKE '%鏃ラ棿%'
+            OR importance_flag_code LIKE '%FH0165.01%'
+            OR importance_flag_code LIKE '%FH0165.02%')
+        </if>
+        <if test="daytimeOnly != null and daytimeOnly == 0">
+            AND (importance_flag_code IS NULL
+            OR (importance_flag_code NOT LIKE '%鏃ラ棿%'
+            AND importance_flag_code NOT LIKE '%FH0165.01%'
+            AND importance_flag_code NOT LIKE '%FH0165.02%'))
+        </if>
         <!-- 2026-10-21锛歷isit_time 涓虹┖鏃舵寜瀹屾垚/鍒涘缓鏃堕棿鍏滃簳 -->
         <if test="startTime != null and endTime!=null">
             AND IFNULL(visit_time, IFNULL(finishtime, create_time)) >= DATE(#{startTime})

--
Gitblit v1.9.3