From 275cc504242a476b88892395f020be15f7b75d0c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 22 十二月 2025 14:59:32 +0800
Subject: [PATCH] Merge branch 'master-001'

---
 smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
index a1c2dbf..cd8f56c 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -5,6 +5,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鍗曚竴浠诲姟锛堥殢璁匡級Mapper鎺ュ彛
@@ -30,11 +31,17 @@
      */
     public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskVO serviceSubtaskVO);
 
+    public List<ServiceSubtask> selectServiceSubtaskByDiagname(ServiceSubtask serviceSubtask);
+
+    public List<ServiceSubtask> queryServiceSubtaskList(ServiceSubtaskVO serviceSubtaskVO);
+
+    public List<ServiceSubtask> selectServiceSubtaskBySendstate(ServiceSubtaskVO serviceSubtaskVO);
+
     public List<ServiceSubtask> selectServiceSubtaskListByCreateTime(ServiceSubtaskVO serviceSubtaskVO);
 
     public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskVO serviceSubtaskVO);
 
-    public Integer selectSendstateByCondition(ServiceSubtask serviceSubtask);
+    public List<Integer> selectSendstateByCondition(ServiceSubtask serviceSubtask);
 
     /**
      * 鏂板鍗曚竴浠诲姟锛堥殢璁匡級
@@ -94,6 +101,28 @@
 
     public List<ServiceSubtask> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq);
 
+    public List<ServiceSubtaskCount> getSfStatisticsJoy(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
+    public List<ServiceSubtaskCount> getSfStatisticsJoydetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
     public List<PatMedRes> getDeptRanking(PatMedReq patMedReq);
 
+    public List<ServiceStatisticsResponse> getServiceStatistics(ServiceStatisticsRequest serviceStatisticsRequest);
+
+    /**
+     * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺锛堜紭鍖栫増锛�
+     * 鐢ㄤ簬鏇夸唬搴旂敤灞傜殑寰幆缁熻锛岀洿鎺ュ湪鏁版嵁搴撳眰杩涜鑱氬悎璁$畻
+     *
+     * @param serviceSubtaskVO 鏌ヨ鏉′欢
+     * @return Map<String, Object> 鍖呭惈鍚勭姸鎬佺粺璁℃暟鎹�
+     *         wzx: 鏈墽琛屾暟閲�
+     *         ysf: 宸查殢璁挎暟閲�
+     *         fssb: 鍙戦�佸け璐ユ暟閲�
+     *         yfs: 宸插彂閫佹暟閲�
+     *         dsf: 寰呴殢璁挎暟閲�
+     *         blq: 涓嶇悊鐫暟閲�
+     *         yc: 寮傚父鏁伴噺
+     */
+    public Map<String, Object> countByCondition(ServiceSubtaskVO serviceSubtaskVO);
+
 }

--
Gitblit v1.9.3