修复BUG和优化日志

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiSettleApplyService.java

@@ -147,7 +147,6 @@ public class SiSettleApplyService {
         if (param.getInOutFlag() == 2) {
             return ResultVoUtil.success(map);
         }
-        String ybGender = dao.selectYbGender(apply.getPatNo(), apply.getTimes(), apply.getLedgerSn());
         String message = "";
         if (DecimalUtil.compare(apply.getDetailTotalCharge(), apply.getMedinsTotalCharge()) != 0) {
            message += "此患者明细总费用与医保上传总费用不一致；";
@@ -155,7 +154,8 @@ public class SiSettleApplyService {
         if (disYbDiags.isEmpty()) {
             message += "此患者没有出院诊断。";
         }
-        if (!ybGender.equals(String.valueOf(param.getGender()))) {
+        String ybGender = dao.selectYbGender(apply.getPatNo(), apply.getTimes(), apply.getLedgerSn());
+        if (StringUtil.notBlank(ybGender) && !ybGender.equals(String.valueOf(param.getGender()))) {
             message += "此患者医保性别与HIS信息不一致。";
         }
         if (!message.isEmpty()) {

src/main/java/thyyxxk/webserver/service/outpatient/wxapi/SendWxInfoService.java

@@ -39,11 +39,10 @@ public class SendWxInfoService {
         param.put("msgtype", "text");
         param.put("text", msgObj);
         param.put("safe", SAFE_MODE);
-        log.info("推送企业信息消息 >>> {}", param);
         RestTemplate restTemplate = new RestTemplate();
         String response = restTemplate.postForObject(requestUrl, param, String.class);
         JSONObject result = JSONObject.parseObject(response);
-        log.info("推送企业信息消息结果 >>> {}", result);
+        log.info("推送企业信息消息：\n内容：{}\n结果：{}", param, result);
         return result;
     }
 
@@ -57,11 +56,10 @@ public class SendWxInfoService {
         userlist.add("2801");
         msgobj.put("userlist", userlist);
         msgobj.put("chatid", SnowFlakeId.instance().nextId());
-        log.info("创建企业微信群聊 >>> {}", msgobj);
         RestTemplate restTemplate = new RestTemplate();
         String response = restTemplate.postForObject(url, msgobj, String.class);
         JSONObject result = JSONObject.parseObject(response);
-        log.info("创建企业微信群聊结果 >>> {}", result);
+        log.info("创建企业微信群聊：\n内容：{}\n结果：{}", msgobj, result);
         return result;
     }
 
@@ -74,11 +72,10 @@ public class SendWxInfoService {
         text.put("content", content);
         msgobj.put("text", text);
         msgobj.put("safe", 0);
-        log.info("发送企业微信群聊消息 >>> {}", msgobj);
         RestTemplate restTemplate = new RestTemplate();
         String response = restTemplate.postForObject(url, msgobj, String.class);
         JSONObject result = JSONObject.parseObject(response);
-        log.info("发送企业微信群聊消息结果 >>> {}", result);
+        log.info("发送企业微信群聊消息：\n内容：{}\n结果：{}", msgobj, result);
         return result;
     }