From 5673a45b1bbbe33f2837ba8d94ce601c5f3e41b5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 27 四月 2025 13:58:58 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java           |    6 +++---
 smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java              |   41 ++++++++++++++++++++++-------------------
 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java |    4 ++--
 3 files changed, 27 insertions(+), 24 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 a3b6e4e..5d0c42c 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, null, patArchive.getPatientno());
                             Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
                             if (!map.isEmpty()) {
                                 serviceSubtask.setResult("success");
@@ -644,7 +644,7 @@
         xinHuaWXReq.setTitlename(taskName);
         xinHuaWXReq.setContent(taskDesc);
         xinHuaWXReq.setAppid(appid);
-
+        log.error("-----寰俊鍏紬鍙风殑鍑哄樊涓�----锛歿}", xinHuaWXReq);
         String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
         JSONObject jsonObject = JSONObject.parseObject(result);
         String code = (String) jsonObject.toString();
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 241063b..b163b85 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
@@ -251,7 +251,7 @@
         //鍑洪櫌琛�
         iPatMedInhospService.dealOutHospInfo();
         //闂ㄨ瘖琛�
-        if(visitHosp!=1) {
+        if (visitHosp != 1) {
             iPatMedOuthospService.dealOutpatientInfo();
         }
     }
@@ -535,7 +535,7 @@
                                 url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=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, null, patArchive.getPatientno());
 
                                 Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
 
@@ -803,7 +803,7 @@
         xinHuaWXReq.setTitlename(taskName);
         xinHuaWXReq.setContent(taskDesc);
         xinHuaWXReq.setAppid(appid);
-
+        log.error("----getWXCode---xinHuaWXReq鐨勫嚭鍙備负锛歿}", xinHuaWXReq);
         String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
         JSONObject jsonObject = JSONObject.parseObject(result);
         String code = (String) jsonObject.toString();
diff --git a/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java b/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
index 2e853db..fab95b7 100644
--- a/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
+++ b/smartor/src/main/java/com/smartor/domain/XinHuaWXReq.java
@@ -16,27 +16,11 @@
 public class XinHuaWXReq {
     private static final long serialVersionUID = 1L;
 
-//    /**
-//     * 鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�
-//     */
-//    @ApiModelProperty(value = "鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�")
-//    private String service = "smarthos.yygh.ApiService.push";
-//
-//    private String spid = "1001";
-
     /**
-     * 璇佷欢鍙�
+     * 鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�
      */
-    @Excel(name = "  璇佷欢鍙�")
-    @ApiModelProperty(value = "璇佷欢鍙�")
-    private String idcard;
-
-    /**
-     * 璇︽儏鍦板潃
-     */
-    @Excel(name = "閾炬帴鍦板潃")
-    @ApiModelProperty(value = "閾炬帴鍦板潃")
-    private String url;
+    @ApiModelProperty(value = "鎺ュ彛鏈嶅姟鍚嶏紝鍥哄畾鍊�")
+    private String service = "smarthos.pat.notice";
 
 
     /**
@@ -44,6 +28,7 @@
      */
     @ApiModelProperty(value = "搴旂敤缂栧彿")
     private String appid;
+
 
     /**
      * 鎮ｈ�呯紪鍙�
@@ -56,6 +41,12 @@
      */
     @ApiModelProperty(value = "鎮ｈ�呭鍚�")
     private String patientname;
+    /**
+     * 璇佷欢鍙�
+     */
+    @Excel(name = "  璇佷欢鍙�")
+    @ApiModelProperty(value = "璇佷欢鍙�")
+    private String idcard;
 
     /**
      * 鎵嬫満鍙风爜
@@ -81,4 +72,16 @@
     @ApiModelProperty(value = "閾炬帴鍦板潃")
     private String content;
 
+    /**
+     * 璇︽儏鍦板潃
+     */
+    @Excel(name = "閾炬帴鍦板潃")
+    @ApiModelProperty(value = "閾炬帴鍦板潃")
+    private String url;
+
+
+
+
+
+
 }

--
Gitblit v1.9.3