From b0e0b4c0e342865daefb31eb3b956129fe722c8c Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 24 九月 2025 14:31:33 +0800
Subject: [PATCH] 随访查询7应随访日期(倒序)8应随访日期(正序)

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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 a21a826..5fd05cb 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
@@ -16,6 +16,7 @@
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.sms.smsUtils;
 import com.ruoyi.quartz.service.ICollectHISService;
+import com.ruoyi.system.service.ISysConfigService;
 import com.smartor.common.LSHospTokenUtil;
 import com.smartor.domain.*;
 import com.smartor.mapper.HeLibraryMapper;
@@ -89,6 +90,9 @@
 
     @Autowired
     private ICollectHISService ichService;
+
+    @Autowired
+    private ISysConfigService configService;
 
 
     @Value("${localIP}")
@@ -534,9 +538,10 @@
                                     req.put("content", sendMagParam.getContent());
                                     isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
                                 } else if (visitHosp == 2) {
+                                    String url = configService.selectConfigByKey("token.360",serviceSubtask.getOrgid());
                                     //涓芥按鐨勭煭淇″彂閫佹柟寮�
                                     Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
-                                    String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid());
+                                    String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(),url);
                                     if (ObjectUtils.isNotEmpty(map) && StringUtils.isEmpty(map.get("address"))) {
                                         ServiceSubtask ss = new ServiceSubtask();
                                         ss.setResult("error");
@@ -638,8 +643,15 @@
                                     serviceSubtaskMapper.updateServiceSubtask(ss);
                                     continue;
                                 }
-                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
-
+                                String wxCode = "";
+                                if (visitHosp == 3) {//甯備竴鍖婚櫌
+                                    String urlTemp="http://192.200.54.14:5003/sfjk/SendMessage?sfzh="+serviceSubtask.getSfzh()
+                                            +"&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��&content=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��&phone="+patArchive.getTelcode()
+                                            +"&url="+url+"&key=ff76f8904f5f32b5ee1739e8ea46e60g";
+                                    HttpUtils.sendGet(urlTemp);
+                                }else{
+                                    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);
                                 //浠诲姟鍙戦�佽褰�
                                 ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();

--
Gitblit v1.9.3