Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@@ -3169,9 +3169,10 @@ public class YkyyEntranceService {
                logger.info("更新患者信息updateResponse:" + updateContent);
                JSONObject rsult = JSON.parseObject(updateContent);
                Integer s = rsult.getInteger("status");
                if (s != 200) {
                String message = rsult.getString("message");
                if (s != 200 || !message.equals("成功")) {
                    res.put("status", -1);
                    res.put("message", "更新社保卡失败！");
                    res.put("message", message);
                    return res;
                }
            }
@@ -3195,9 +3196,10 @@ public class YkyyEntranceService {
                    logger.info("更新患者信息updateResponse:" + updateContent);
                    JSONObject rsult = JSON.parseObject(updateContent);
                    Integer s = rsult.getInteger("status");
                    if (s != 200) {
                    String message = rsult.getString("message");
                    if (s != 200 || !message.equals("成功")) {
                        res.put("status", -1);
                        res.put("message", "更新社保卡失败！");
                        res.put("message", message);
                        return res;
                    }
                }else {