From 60a0f24ddd8ddfc21b23750df0990f9089a1f0f4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 27 四月 2025 17:48:27 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 2 +-
ruoyi-admin/src/main/resources/application-druid.yml | 3 +--
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 2 +-
3 files changed, 3 insertions(+), 4 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 5d0c42c..fc4325e 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
@@ -489,7 +489,7 @@
url = ip + ":" + req_path + "/xj?p=" + format;
}
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask.getPatid());
- String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), null, null, patArchive.getPatientno());
+ String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), null, patArchive.getName(), patArchive.getPatientno());
Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
if (!map.isEmpty()) {
serviceSubtask.setResult("success");
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index a778413..cf03329 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -29,7 +29,6 @@
# password: Hxerp2000
# driverClassName: com.mysql.cj.jdbc.Driver
-
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(鍏徃)
@@ -103,7 +102,7 @@
default-size: 10
#寰俊鍏紬鍙风殑瀵嗛挜锛堜附姘达級
-appid: 3311000002.
+appid: "3311000002"
appSecret: MzMxMTAwMDAwMg==
#绗笁鏂瑰井淇″叕浼楀彿鍙戦�佸湴鍧�锛堜附姘达級
thirdWXUrl: http://192.168.10.170:18001/frontend/medical/api
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 b163b85..3d1a9be 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
@@ -535,7 +535,7 @@
url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
// String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
- String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), null, null, patArchive.getPatientno());
+ String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), null, serviceSubtask.getSendname(), patArchive.getPatientno());
Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
--
Gitblit v1.9.3