From 9a6ae1d105033b057f58586723c78ae86ad3cfc9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 08 六月 2026 15:54:46 +0800
Subject: [PATCH] 【丽水】随访查询页面-统计调整 * total: 患者服务总量 * wxsf: 无需随访数量 sendstate != 4 * xsf: 需随访数量 sendstate = 4 * dsf: 待随访数量 sendstate = 1L, 2L, 3L, 5L, 7L * ywc: 已完成数量 sendstate = 6L * yc: 异常数量 excep = '1' * yc: 警告数量 excep = '2'
---
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 5bd1df3..9ca2ee3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -863,13 +863,8 @@
if (serviceSubtaskPreachform1.getSort() == spSize.size()) {
if (failSendstate.equals("4") || failSendstate.equals("5")) {
serviceSubtask.setCurrentPreachform(preachform);
- serviceSubtask.setSendstate(5L);
- serviceSubtask.setRemark("澶勭悊琛ュ伩浠诲姟,褰撳墠澶勭悊鏈�鍚庤ˉ鍋匡紝鍏ㄩ儴鎵ц澶辫触");
- //浜哄伐鍙戦�佽秴鏃�
- if (ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")) {
- serviceSubtask.setSendstate(7L);
- serviceSubtask.setRemark("浜哄伐鍙戦�佽秴鏃�");
- }
+ serviceSubtask.setSendstate(7L);
+ serviceSubtask.setRemark("澶勭悊琛ュ伩浠诲姟,褰撳墠澶勭悊鏈�鍚庤ˉ鍋匡紝鍏ㄩ儴鎵ц澶辫触(瓒呮椂)");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
return true;
}
@@ -883,11 +878,6 @@
serviceSubtask.setCurrentPreachform(preachform);
serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime(), serviceSubtask.getCurrentPreachform()));
serviceSubtask.setSendstate(3L);
- //浜哄伐鍙戦�佽秴鏃�
- if (ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")) {
- serviceSubtask.setSendstate(7L);
- serviceSubtask.setRemark("浜哄伐鍙戦�佽秴鏃�");
- }
if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {
//濡傛灉鏄鏁欐垨閫氱煡锛屽苟涓斿彂閫佹垚鍔燂紝鍒欑洿鎺ュ皢serviceSubtask鐘舵�佹敼鎴�6L锛堣繖涓偅鑰呮槸娌℃湁棰樺仛鐨勶紝涓嶄細鍐嶈Е鍙戞帴鍙ｈ繘琛岀姸鎬佷慨鏀癸級
if (failSendstate.equals("2")) {
--
Gitblit v1.9.3