From 5714942e993f44603f8f85a2963f02ead22f97f3 Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Fri, 12 Jan 2024 09:14:14 +0800
Subject: [PATCH] =?UTF-8?q?#fix=20=E4=BC=98=E5=8C=96=E9=97=AE=E8=AF=8A?=
 =?UTF-8?q?=E5=8D=A1=E6=8E=A8=E9=80=81=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LymsHisInfoServiceImpl.java       | 47 +++++++++++++---------
 .../talkonlineweb/task/ServiceContentTask.java     |  4 +-
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java
index d9c2976..c0ac50d 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java
@@ -73,41 +73,48 @@ public class LymsHisInfoServiceImpl extends ServiceImpl<LymsHisInfoMapper, LymsH
              new Thread(new Runnable() {
                  @Override
                  public void run() {
-                     LymsPatient patient =null;
-                     String idCard = lymsHisInfo.getIdcard();
-                     if (StringUtil.isEmpty(idCard)) {
-                         QueryWrapper<LymsPatient> queryWrapper = new QueryWrapper<>();
-                         queryWrapper.eq("pname",lymsHisInfo.getName());
-                         queryWrapper.eq("enrolment_phone",lymsHisInfo.getPhone());
-                         List<LymsPatient> list = lymsPatientService.list(queryWrapper);
-                         if(CollectionUtils.isNotEmpty(list)){
-                             patient=list.get(0);
+                     try {
+                         Thread.sleep(5000);
+                         LymsPatient patient =null;
+                         String idCard = lymsHisInfo.getIdcard();
+                         if (StringUtil.isEmpty(idCard)) {
+                             QueryWrapper<LymsPatient> queryWrapper = new QueryWrapper<>();
+                             queryWrapper.eq("pname",lymsHisInfo.getName());
+                             queryWrapper.eq("enrolment_phone",lymsHisInfo.getPhone());
+                             List<LymsPatient> list = lymsPatientService.list(queryWrapper);
+                             if(CollectionUtils.isNotEmpty(list)){
+                                 patient=list.get(0);
+                             }
+                         }else {
+                             //判断患者是否存在
+                             LymsPatient patientQuery = new LymsPatient();
+                             patientQuery.setIdno(idCard.toLowerCase());
+                             patient = lymsPatientService.getOne(Wrappers.query(patientQuery));
                          }
-                     }else {
-                         //判断患者是否存在
-                         LymsPatient patientQuery = new LymsPatient();
-                         patientQuery.setIdno(idCard.toLowerCase());
-                         patient = lymsPatientService.getOne(Wrappers.query(patientQuery));
-                     }
-                     if (patient!=null){
-                         List<PushOrderResult> orderList= lymsOrderService.selectPushOrder(patient.getId());
-                         if (CollectionUtils.isNotEmpty(orderList)){
-                                PushOrderResult order= orderList.get(0);
+                         if (patient!=null){
+                             List<PushOrderResult> orderList= lymsOrderService.selectPushOrder(patient.getId());
+                             log.info("SendWeChatMsg--->orderList,"+orderList.toString());
+                             if (CollectionUtils.isNotEmpty(orderList)){
+                                 PushOrderResult order= orderList.get(0);
                                  //推送微信公众号
                                  Map<String,Object> map=new HashMap<>();
                                  map.put("keyword1",new DataEntity(order.getPname(),"#173177"));
                                  map.put("keyword2",new DataEntity(order.getHname(),"#173177"));
-                                 map.put("keyword3",new DataEntity(order.getDname(),"#173177"));
+                                 map.put("keyword3",new DataEntity(order.getDname()+"【点击此提醒可查看服务具体内容】","#173177"));
 
                                  //公众号跳转小程序需要的登录信息
                                  Map<String,Object> mapInfo =lymsUserService.pLoginInfo(order.getPid(),3);
                                  try {
+                                     log.info("SendWeChatMsg--->startup");
                                      Integer code= WeiXinUtil.SendWeChatMsg(order.getGzopenid(),Constant.GZ_TEMPLATE_ID,map,mapInfo);
                                      log.info("SendWeChatMsg--->code, "+code);
                                  } catch (Exception e) {
                                      log.error("serviceContent Exception,"+e.getMessage());
                                  }
+                             }
                          }
+                     }catch (Exception e){
+                         log.error("upHisInfo---> Thread Exception"+e.getMessage());
                      }
                  }
              }).start();
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java
index a04d544..177e4cd 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java
@@ -55,12 +55,12 @@ public class ServiceContentTask {
              Map<String,Object> map=new HashMap<>();
              map.put("keyword1",new DataEntity(order.getPname(),"#173177"));
              map.put("keyword2",new DataEntity(order.getHname(),"#173177"));
-             map.put("keyword3",new DataEntity(order.getDname(),"#173177"));
+             map.put("keyword3",new DataEntity(order.getDname()+"【点击此提醒可查看服务具体内容】","#173177"));
 
              //公众号跳转小程序需要的登录信息
              Map<String,Object> mapInfo =lymsUserService.pLoginInfo(order.getPid(),3);
                 try {
-
+                    log.info("serviceContent-->SendWeChatMsg--->start up");
                     Integer code= WeiXinUtil.SendWeChatMsg(order.getGzopenid(),Constant.GZ_TEMPLATE_ID,map,mapInfo);
                     log.info("SendWeChatMsg--->code, "+code);
                 } catch (Exception e) {
-- 
1.8.3.1