From f72ef74fcf12c6818f6202ab88e19e5efcdb374d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= <absorber@absorber.local>
Date: Wed, 3 Apr 2024 14:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9AI=E9=97=AE=E8=AF=8A=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E7=9A=84=E5=85=A5=E5=8F=82=E4=BB=A5=E5=8F=8A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Eopenid=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ynxbd/common/action/PWEAction.java |  2 +-
 .../com/ynxbd/wx/config/MessagePushConfig.java  | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ynxbd/common/action/PWEAction.java b/src/main/java/com/ynxbd/common/action/PWEAction.java
index 9bb5966..99abab2 100644
--- a/src/main/java/com/ynxbd/common/action/PWEAction.java
+++ b/src/main/java/com/ynxbd/common/action/PWEAction.java
@@ -112,7 +112,7 @@ public class PWEAction extends BaseAction {
             log.info("[预问诊]6.3 预问诊完成通知 partnerId={}, hospitalId={}, registeredId={}, progress={}", partnerId, hospitalId, registeredId, progress);
             if ("1".equals(progress)) {
                 log.info("[预问诊]报告生成进度100%");
-                MessagePushConfig.regAIReport(order.getPatientId());
+                MessagePushConfig.regAIReport(order.getPatientId(),order.getOutTradeNo(),order.getOpenid());
             }
             return PWEResult.success();
         } catch (Exception e) {
diff --git a/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java b/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java
index 5e80877..62c7a4a 100644
--- a/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java
+++ b/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java
@@ -197,10 +197,16 @@ public class MessagePushConfig {
                 return;
             }
 
+            String url = PWEHelper.getH5PWEUrl(reg.getOutTradeNo(),reg.getOpenid());
+            if(url==null||"".equals(url)){
+                log.warn("[推送][推送]AI智能问诊推送通知失败，问诊获取参数为空");
+                return;
+            }
+
             RequestBody requestBody = new FormBody.Builder()
                     .add("patientId",patientId)
                     .add("content","为了帮助医生更全面地了解您的身体情况，请花2分钟时间填写病情信息，以便医生提前了解病症，为您提供更好的诊疗服务。")
-                    .add("url", PWEHelper.getH5PWEUrl(patientId))
+                    .add("url", url)
                     .add("organizeName",ORGANIZENAME)
                     .build();
             OkHttpHelper.post(OBS_DOCUMENT, requestBody);
@@ -214,7 +220,7 @@ public class MessagePushConfig {
      * AI诊疗推送
      * @param patientId
      */
-    public static void regAIReport(String patientId){
+    public static void regAIReport(String patientId,String outTradeNo,String openId){
         try {
             if (!REG_AI_IS_ENABLE  || ObjectUtils.isEmpty(REG_AI_URL)) {
                 return;
@@ -224,11 +230,16 @@ public class MessagePushConfig {
                 log.warn("[推送]AI问诊报告推送通知失败，参数缺失~ patientId= null");
                 return;
             }
+            String url = PWEHelper.getH5PWEUrl(outTradeNo,openId);
+            if(url==null||"".equals(url)){
+                log.warn("[推送]AI问诊报告推送通知失败，问诊获取参数为空");
+                return;
+            }
 
             RequestBody requestBody = new FormBody.Builder()
                     .add("patientId",patientId)
                     .add("content","您好，您的预问诊报告可以查看啦")
-                    .add("url", PWEHelper.getH5PWEUrl(patientId))
+                    .add("url", url)
                     .add("organizeName",ORGANIZENAME)
                     .build();
             OkHttpHelper.post(OBS_DOCUMENT, requestBody);