From c1f47dd490c6c8d69708eb7cda2330bb89623257 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 02 三月 2026 11:20:12 +0800
Subject: [PATCH] 【丽水】多维度随访
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 4b40ebf..ae799e1 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -412,6 +412,21 @@
}
}
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
+ */
+ public void dealOutHospInfoByDimension() {
+ String config = configService.selectConfigByKey("visit.early.day");
+ if (port.equals("8095")) {
+ //鍑洪櫌琛�
+ iPatMedInhospService.dealOutHospInfoByDimension(config);
+ //闂ㄨ瘖琛�(鏂板崕鐨勬殏鏃朵笉鍋氶棬璇婇殢璁�)
+ if (!active.equals("xh")) {
+// iPatMedOuthospService.dealOutpatientInfo();
+ }
+ }
+ }
+
/**
* 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
@@ -434,7 +449,7 @@
/**
- *
+ * 闀挎湡浠诲姟鍙戦��
*/
public void longTaskSend() {
//鑾峰彇浠诲姟淇℃伅
@@ -494,6 +509,7 @@
Long cs = currentSort.get();
if (cs.equals(serviceSubtaskPreachforms.size())) {
serviceSubtask.setSendstate(5L);
+ serviceSubtask.setRemark("澶勭悊琛ュ伩浠诲姟,褰撳墠澶勭悊鏈�鍚庤ˉ鍋匡紝鍏ㄩ儴鎵ц澶辫触");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
//淇敼鍙戦�佹柟寮忕殑鐘舵�佷负澶辫触
serviceSubtaskPreachform.setSendstate("5");
@@ -530,6 +546,10 @@
return !localDate.isAfter(today);
}
+ /**
+ * 闅忚-琛ュ伩澶勭悊
+ * @param serviceSubtask
+ */
public void sfHandlle(ServiceSubtask serviceSubtask) {
//杩欓噷闇�瑕佹牴鎹韩浠借瘉鍘婚噸(缁欏井淇″皬绋嬪簭鐨勫浐瀹氫换鍔＄敤鐨�)
List<ServiceSubtask> serviceSubtaskListFilter = new ArrayList<>();
@@ -810,7 +830,7 @@
wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
}
- Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
+ Map map = JSONObject.parseObject(wxCode, Map.class);
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
@@ -819,12 +839,22 @@
serviceSubtaskRecord.setPreachform("4");
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
serviceSubtaskRecord.setResult("success");
- if (!map.isEmpty() && (Boolean) map.get("succ") == false) serviceSubtaskRecord.setResult("error");
+ Boolean wxCodeSuccess = false;
+ if(active.equals("hzszlyy")){
+ if(!map.isEmpty() && map.get("success") != null){
+ wxCodeSuccess = (boolean) map.get("success");
+ }
+ }else {
+ if(!map.isEmpty() && map.get("succ") != null){
+ wxCodeSuccess = (boolean) map.get("succ");
+ }
+ }
+ if (!map.isEmpty() && !wxCodeSuccess) serviceSubtaskRecord.setResult("error");
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
//鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
serviceSubtask.setSendstate(3L);
- if ((Boolean) map.get("succ") == true) {
+ if (wxCodeSuccess) {
serviceSubtask.setResult("success");
setSuccessPreachForm(serviceSubtask, sendPreachform, "銆愬叕浼楀彿銆戝叕浼楀彿鍙戦�佹垚鍔�", "2");
} else {
@@ -905,6 +935,7 @@
if (allSendStateNot1AndNot9) {
//璇存槑鍏ㄥ彂閫佸け璐ヤ簡
serviceSubtask.setSendstate(5L);
+ serviceSubtask.setRemark("getSendPreachform鏂规硶 妫�鏌ユ槸鍚︽墍鏈塻endstate涓嶇瓑浜�9, 鍏ㄥけ璐ヤ簡");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
//淇敼鍙戦�佺姸鎬�
setFail(serviceSubtaskPreachforms, serviceSubtask);
@@ -923,8 +954,9 @@
// 鎵惧埌涓嬩竴涓猻ort瀵瑰簲鐨刾reachform
String nextPreachform = serviceSubtaskPreachforms.stream().filter(item -> nextSort.equals(item.getSort())).map(ServiceSubtaskPreachform::getPreachform).findFirst().orElse("-1");
+ String orgid = serviceSubtask.getOrgid();
//寰俊宸插彂閫併�佸凡棰嗗彇璺宠繃鐭俊鍙戦�侊紝杩涜浜哄伐 -涓芥按涓尰闄�
- if (active.equals("47231022633110211A2101")) {
+ if (StringUtils.isNotEmpty(orgid) && orgid.equals("47231022633110211A2101")) {
//鑾峰彇褰撳墠鍙戦�佹柟寮�
ServiceSubtaskPreachform currentServiceSubtaskPreachform = serviceSubtaskPreachforms.stream().filter(item -> item.getSort().equals(currentSort.get())).findFirst().orElse(new ServiceSubtaskPreachform());
//褰撳墠鍙戦�佹柟寮忎负寰俊鐨勶紝涓斾笅涓�鍙戦�佹柟寮忎负鐭俊鐨勶紝寰俊鍙戦�佺姸鎬佷负宸插彂閫併�佸凡棰嗗彇鐨勶紝璺宠繃鐭俊姝ラ
@@ -1120,6 +1152,7 @@
if (failSendstate.equals("4") || failSendstate.equals("5")) {
serviceSubtask.setCurrentPreachform(preachform);
serviceSubtask.setSendstate(5L);
+ serviceSubtask.setRemark("setSuccessPreachForm鏂规硶锛屽綋鍓嶇殑preachform宸茬粡鏄渶鍚庝竴涓簡锛屽叏閮ㄦ墽琛屽け璐�");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
return true;
}
--
Gitblit v1.9.3