From 48a112a2718cefda8d9a80420dba780171b06d3e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 14 四月 2026 17:32:40 +0800
Subject: [PATCH] 【景宁】再次随访的随访任务做完，首次的随访任务的完成时间也变成再次随访的完成时间
---
smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java | 123 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 4 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..3bb4019 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -1,10 +1,16 @@
package com.smartor.mapper;
import com.smartor.domain.*;
+import com.smartor.domain.VO.PatSatisfactionReqVO;
+import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
+import com.smartor.domain.entity.ServiceSubtaskSatisfactionEntity;
+import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* 鍗曚竴浠诲姟锛堥殢璁匡級Mapper鎺ュ彛
@@ -28,13 +34,29 @@
* @param serviceSubtaskVO 鍗曚竴浠诲姟锛堥殢璁匡級
* @return 鍗曚竴浠诲姟锛堥殢璁匡級闆嗗悎
*/
- public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskVO serviceSubtaskVO);
+ public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskEntity serviceSubtaskVO);
- public List<ServiceSubtask> selectServiceSubtaskListByCreateTime(ServiceSubtaskVO serviceSubtaskVO);
+ public List<ServiceSubtask> selectSatisfactionSubtaskList(PatSatisfactionReqVO serviceSubtaskVO);
- public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskVO serviceSubtaskVO);
+ /**
+ * 鐢ㄤ簬琛ュ伩鏌ヨ
+ *
+ * @param serviceSubtaskVO
+ * @return
+ */
+ public List<ServiceSubtask> getCompensateServiceSubtaskList(ServiceSubtaskEntity serviceSubtaskVO);
- public Integer selectSendstateByCondition(ServiceSubtask serviceSubtask);
+ public List<ServiceSubtask> selectServiceSubtaskByDiagname(ServiceSubtask serviceSubtask);
+
+ public List<ServiceSubtask> queryServiceSubtaskList(ServiceSubtaskEntity serviceSubtaskVO);
+
+ public List<ServiceSubtask> selectServiceSubtaskBySendstate(ServiceSubtaskEntity serviceSubtaskVO);
+
+ public List<ServiceSubtask> selectServiceSubtaskListByCreateTime(ServiceSubtaskEntity serviceSubtaskVO);
+
+ public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskEntity serviceSubtaskVO);
+
+ public List<Integer> selectSendstateByCondition(ServiceSubtask serviceSubtask);
/**
* 鏂板鍗曚竴浠诲姟锛堥殢璁匡級
@@ -51,6 +73,15 @@
* @return
*/
public Double selectTimelyRate(ServiceSubtask ServiceSubtask);
+
+ /**
+ * 闅忚鍙婃椂鐜囷細搴旈殢璁挎椂闂�<瀹為檯闅忚鏃堕棿
+ *
+ * @param ServiceSubtaskvo
+ * @return
+ */
+ @MapKey("groupKey")
+ public Map<String, Map<String, Object>> selectTimelyRateBatch(ServiceSubtaskEntity ServiceSubtaskvo);
/**
* 闅忚鍙婃椂鐜囪鎯�
@@ -94,6 +125,90 @@
public List<ServiceSubtask> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq);
+ public List<String> getSfStatisticsGroupKey(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
+ public List<ServiceSubtaskCount> getSfStatisticsJoy(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
+ public List<ServiceSubtaskCount> getSfStatisticsJoydetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
+ /**
+ * 鑾峰彇闂缁熻缁撴灉锛堥殢璁匡級
+ *
+ * @return 缁撴灉
+ */
+ public List<ServiceSubtaskCount> getSfStatisticsCategory(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
+ /**
+ * 鑾峰彇闂缁熻缁撴灉锛堥殢璁匡級
+ *
+ * @return 缁撴灉
+ */
+ public List<ServiceSubtaskScriptCount> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
+ /**
+ * 鑾峰彇闂鍥炵瓟缁熻缁撴灉锛堥殢璁匡級
+ *
+ * @return 缁撴灉
+ */
+ public List<ServiceSubtaskScriptCount> getSfStatisticsScriptItemDetails(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(ServiceSubtaskEntity serviceSubtaskVO);
+
+ /**
+ * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺锛堜紭鍖栫増锛�
+ *
+ * @param serviceSubtaskVO 鏌ヨ鏉′欢
+ * @return Map<String, Object> 鍖呭惈鍚勭姸鎬佺粺璁℃暟鎹�
+ * pendingVisitCount: 褰撳墠鐧诲綍浜烘埅姝粖鏃ュ緟闅忚鎬婚噺
+ * failedVisitCount: 褰撳墠鐧诲綍浜洪殢璁夸换鍔″け璐ユ�婚噺
+ * abnormalVisitVount: 褰撳墠鐧诲綍浜洪殢璁夸换鍔″紓甯告�婚噺
+ * allVisitCount: 褰撳墠鐧诲綍浜洪殢璁夸换鍔℃�婚噺
+ */
+ public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity serviceSubtaskVO);
+
+ /**
+ * 鑾峰彇闂ㄨ瘖闅忚浜烘暟
+ *
+ * @param patMedReq
+ * @return
+ */
+ PatMedRes selectVisitCount(PatMedReq patMedReq);
+
+ List<Long> querySendCount(ServiceSubtaskSatisfactionEntity serviceSubtaskSatisfactionEntity);
+
+ /**
+ * 鎸夌梾鍖哄垎缁勭粺璁″欢缁姢鐞嗘暟閲�
+ *
+ * @param vo 鏌ヨ鏉′欢
+ * @return 姣忎釜鐥呭尯鐨勭粺璁＄粨鏋�
+ */
+ List<Map<String, Object>> getContinueNurseCount(ServiceSubtaskCotinueCountVO vo);
+
+ /**
+ * 鎸夌瀹ゅ垎缁勭粺璁″欢缁姢鐞嗘暟閲�
+ *
+ * @param vo 鏌ヨ鏉′欢
+ * @return 姣忎釜绉戝鐨勭粺璁＄粨鏋�
+ */
+ List<Map<String, Object>> getContinueNurseCountByDept(ServiceSubtaskCotinueCountVO vo);
+
}
--
Gitblit v1.9.3