From cf8712a9c0816559f50644f15672e7359028c4c4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:02:58 +0800
Subject: [PATCH] 妇幼-住院完成生成
---
ruoyi-task/src/main/java/com/ruoyi/task/mapper/ServiceSubtaskMapper.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/mapper/ServiceSubtaskMapper.java b/ruoyi-task/src/main/java/com/ruoyi/task/mapper/ServiceSubtaskMapper.java
index e7e2a02..fa5e26e 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/mapper/ServiceSubtaskMapper.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/mapper/ServiceSubtaskMapper.java
@@ -48,6 +48,20 @@
public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskEntity serviceSubtaskVO);
/**
+ * 鏌ヨ宸插畬鎴愩�佷笖灏氭湭琚笓绉戞。妗堢敓鎴愭棩蹇楀鐞嗙殑浣忛櫌闅忚瀛愪换鍔★紙琛ュ伩鎵弿鐢級銆�
+ *
+ * @param orgid 鏈烘瀯ID
+ * @param serviceTypes 鏈嶅姟绫诲瀷鐧藉悕鍗�
+ * @param startTime 瀹屾垚鏃堕棿涓嬮檺
+ * @param limit 鏈�澶ф潯鏁�
+ * @return 瀛愪换鍔￠泦鍚�
+ */
+ public List<ServiceSubtask> selectCompletedInhospFollowups(@Param("orgid") String orgid,
+ @Param("serviceTypes") List<String> serviceTypes,
+ @Param("startTime") Date startTime,
+ @Param("limit") int limit);
+
+ /**
* 鍒嗛〉绗竴闃舵锛氬彧鍙栧綋鍓嶉〉鐨勫瓙浠诲姟 id銆�
* <p>
* where / order 涓� {@link #selectServiceSubtaskList} 鍏辩敤鍚屼竴浠� XML 鐗囨
@@ -126,10 +140,14 @@
/**
* 闅忚鍙婃椂鐜囷紙鎸� groupKey 鍒嗙粍鎵归噺缁熻锛�
* <p>
- * rate锛氬嚭闄㈡椂闂�(endtime)璧� rateDay + 琛ュ伩澶╂暟 鍐呭畬鎴愰殢璁跨殑鍗犳瘮銆�
+ * rate锛氬畬鎴愭椂闂�(finishtime) 涓嶆櫄浜庡強鏃剁巼鍩哄噯鐨勫崰姣旓紝鍒嗘瘝涓哄簲闅忚鏁般��
+ * 闈炰换鍔＄粍(appltype != 5)锛歟ndtime + send_day(缂虹渷1) + 危琛ュ伩澶╂暟 + 1 澶╋紱
+ * 浠诲姟缁�(appltype = 5)锛氭寜 schedule_benchmark 瑙ｆ瀽鍩哄噯鏃堕棿
+ * (1-鍏ラ櫌 2-鍑洪櫌 3-灏辫瘖 4-鍏ョ粍 0/鍏跺畠-鑷畾涔夋椂闂�) + day_offset
+ * + 危琛ュ伩澶╂暟 + 1 澶╋紙涓嶅彔鍔� send_day锛夈��
* 琛ュ伩澶╂暟鍙栬嚜 service_subtask_preachform.compensate_time 鎸夊瓙浠诲姟姹傚拰锛�
* 鐢ㄥ瓙浠诲姟蹇収鑰岄潪 service_task.preachform_desc锛屼繚璇佸巻鍙叉暟鎹笉闅忎换鍔℃敼閰嶇疆鑰屽彉鍔ㄣ��
- * rateDay 涓虹┖鏃� rate 杩斿洖 NULL銆�
+ * rateDay 鍙傛暟涓嶅啀鍙備笌璇ュ彛寰勩��
* <p>
* finishRate锛氬簲闅忚鏃堕棿(visit_time) <= 瀹為檯瀹屾垚鏃堕棿(finishtime) 鐨勫崰姣旓紝褰撳墠鏈闅忚缁熻浣跨敤銆�
*
--
Gitblit v1.9.3