From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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 a910ec0..07214cf 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
@@ -18,11 +18,8 @@
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
-import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IBaseSmsaccountService;
-import com.smartor.service.IServiceOutPathService;
-import com.smartor.service.IServiceSubtaskRecordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -41,6 +38,20 @@
import com.ruoyi.template.domain.HeLibrary;
import com.ruoyi.template.api.TemplateFacade;
+import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.task.domain.entity.ServiceSubtaskEntity;
+import com.ruoyi.task.domain.ServiceSubtask;
+import com.ruoyi.task.domain.ServiceSubtaskRecord;
+import com.ruoyi.task.domain.ServiceTask;
+import com.ruoyi.task.mapper.ServiceSubtaskMapper;
+import com.ruoyi.task.mapper.ServiceTaskMapper;
+import com.ruoyi.task.domain.ServiceOutPath;
+import com.ruoyi.task.service.IServiceOutPathService;
+import com.ruoyi.task.domain.ServiceSubtaskPreachform;
+import com.ruoyi.task.domain.SendMagParam;
+import com.ruoyi.task.service.IServiceSubtaskRecordService;
+import com.ruoyi.task.mapper.ServiceSubtaskPreachformMapper;
+import com.ruoyi.patarchive.mapper.PatArchiveMapper;
@Slf4j
@Component//鐩戝惉姝ら槦鍒�
public class RedisMqReceiver extends KeyExpirationEventMessageListener {
@@ -325,9 +336,9 @@
serviceOutPath.setParam6(subId);
serviceOutPath.setCreateTime(new Date());
serviceOutPath.setOrgid(serviceSubtask.getOrgid());
- serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
+ serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
- serviceOutPath.setDeptName(serviceSubtask.getDeptname());
+ serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
// sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
@@ -363,9 +374,9 @@
serviceOutPath.setParam3(ivrTask1.getTaskName());
serviceOutPath.setCreateTime(new Date());
serviceOutPath.setOrgid(serviceSubtask.getOrgid());
- serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
+ serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
- serviceOutPath.setDeptName(serviceSubtask.getDeptname());
+ serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
String format = String.format("%03X", serviceOutPath.getId());
@@ -403,9 +414,9 @@
serviceOutPath.setParam3(ivrTask1.getTaskName());
serviceOutPath.setCreateTime(new Date());
serviceOutPath.setOrgid(serviceSubtask.getOrgid());
- serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
+ serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
- serviceOutPath.setDeptName(serviceSubtask.getDeptname());
+ serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
String url = "";
@@ -505,9 +516,9 @@
serviceOutPath.setParam6(subId);
serviceOutPath.setCreateTime(new Date());
serviceOutPath.setOrgid(serviceSubtask.getOrgid());
- serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
+ serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
- serviceOutPath.setDeptName(serviceSubtask.getDeptname());
+ serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
String format = String.format("%03X", serviceOutPath.getId());
@@ -525,9 +536,9 @@
serviceOutPath.setParam6(subId);
serviceOutPath.setCreateTime(new Date());
serviceOutPath.setOrgid(serviceSubtask.getOrgid());
- serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
+ serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
- serviceOutPath.setDeptName(serviceSubtask.getDeptname());
+ serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
String format = String.format("%03X", serviceOutPath.getId());
@@ -549,9 +560,9 @@
serviceOutPath.setParam3(ivrTask1.getTaskName());
serviceOutPath.setParam6(subId);
serviceOutPath.setCreateTime(new Date());
- serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
+ serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
- serviceOutPath.setDeptName(serviceSubtask.getDeptname());
+ serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
serviceOutPath.setOrgid(serviceSubtask.getOrgid());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
--
Gitblit v1.9.3