From c2b737b90fe7be363c732ca50ec2275677d87a50 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Mon, 18 Nov 2024 17:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=AD=A63505A=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java |  4 ++--
 .../java/com/glxp/mipsdl/service/yb/YbClient.java | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java
index 8cb016d..2994142 100644
--- a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java
@@ -1615,7 +1615,7 @@ public class ScpwxyyClient extends CommonHttpClient {
                 } else if (matchBusType(busType, buyType_3502)) {
                     optionUploadCollectOrder3502(ioCollectOrder);
                 } else if (matchBusType(busType, buyType_3505)) {
-                    optionUploadCollectOrder3505(ioCollectOrder);
+                    return optionUploadCollectOrder3505(ioCollectOrder);
                 } else if (matchBusType(busType, buyType_3506)) {
                     optionUploadCollectOrder3506(ioCollectOrder);
                 } else {
@@ -1878,7 +1878,7 @@ public class ScpwxyyClient extends CommonHttpClient {
             return ybClient.ybPostScyh("3505A", dataJson);
 
         } else {
-            return ResultVOUtils.error(500, "未上传医保视图数据查不到");
+            return ResultVOUtils.error(500, "医保视图数据查不到,请核实");
         }
 
     }
diff --git a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java
index d963374..0fd02e8 100644
--- a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java
+++ b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java
@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.net.ConnectException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
@@ -171,8 +172,12 @@ public class YbClient {
                         .last("limit 1")
                 );
 
-            } catch (Exception e) {
-                return ResultVOUtils.error(500, "第三方医保签到失败！！"+e.getMessage());
+            }catch (Exception e) {
+                if(e.getMessage().contains("Connection timed ou")){
+                    return ResultVOUtils.error(500, "第三方医保签到失败==="+"连接超时");
+
+                }
+                return ResultVOUtils.error(500, "第三方医保签到失败==="+e.getMessage());
             }
 
 //                            .eq("","")
@@ -191,7 +196,11 @@ public class YbClient {
             return ResultVOUtils.success("上传医保结果===" + json);
 
         }catch (Exception e){
-            return ResultVOUtils.error(500, "上传医保失败！！"+e.getMessage());
+            if(e.getMessage().contains("Connection timed ou")){
+                return ResultVOUtils.error(500, "上传医保失败==="+"连接超时");
+
+            }
+            return ResultVOUtils.error(500, "上传医保失败==="+e.getMessage());
 
         }
 //