From 7202d6778ea03d248867c054d5f93d842710db51 Mon Sep 17 00:00:00 2001
From: sangchengzhi <2305486879@qq.com>
Date: Fri, 9 Jan 2026 19:13:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=BB=E4=BF=9D=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=92=8Chis=E7=BC=B4=E8=B4=B9=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/CoolRequestCommonStatePersistent.xml        |  2 +-
 src/main/java/com/guahao/common/util/XmlUtil.java | 15 ++++++++++++---
 .../service/impl/YbServiceImpl/YbServiceImpl.java |  6 +++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.idea/CoolRequestCommonStatePersistent.xml b/.idea/CoolRequestCommonStatePersistent.xml
index f1fc881..de15b00 100644
--- a/.idea/CoolRequestCommonStatePersistent.xml
+++ b/.idea/CoolRequestCommonStatePersistent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CoolRequestCommonStatePersistent">
-    <option name="searchCache" value="ou" />
+    <option name="searchCache" value="bu" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/guahao/common/util/XmlUtil.java b/src/main/java/com/guahao/common/util/XmlUtil.java
index 73aec41..15fd5aa 100644
--- a/src/main/java/com/guahao/common/util/XmlUtil.java
+++ b/src/main/java/com/guahao/common/util/XmlUtil.java
@@ -701,9 +701,18 @@ public class XmlUtil {
         str.append("<PayNature>");
         str.append(vo.getPaynature());
         str.append("</PayNature>");
-        str.append("<PayType>");
-        str.append("微信");
-        str.append("</PayType>");
+        // 当vo.getYbzhamount和ybtcamount都是0的时候，且zfamount>=0则此处用微信，其他情况用医保
+        if ((vo.getYbzhamount() == null || vo.getYbzhamount().compareTo(BigDecimal.valueOf(0.00)) == 0) &&
+            (vo.getYbtcamount() == null || vo.getYbtcamount().compareTo(BigDecimal.valueOf(0.00)) == 0) &&
+            vo.getZfamount().compareTo(BigDecimal.valueOf(0.00)) >= 0) {
+            str.append("<PayType>");
+            str.append("自费");
+            str.append("</PayType>");
+        } else {
+            str.append("<PayType>");
+            str.append("医保");
+            str.append("</PayType>");
+        }
         str.append("<PowerTranID>");
         str.append(vo.getPowertranid());
         str.append("</PowerTranID>");
diff --git a/src/main/java/com/guahao/h5/yb/service/impl/YbServiceImpl/YbServiceImpl.java b/src/main/java/com/guahao/h5/yb/service/impl/YbServiceImpl/YbServiceImpl.java
index 3f652e7..3ef52cc 100644
--- a/src/main/java/com/guahao/h5/yb/service/impl/YbServiceImpl/YbServiceImpl.java
+++ b/src/main/java/com/guahao/h5/yb/service/impl/YbServiceImpl/YbServiceImpl.java
@@ -1206,7 +1206,10 @@ public class YbServiceImpl implements YbService {
                 hisMap.put("PSN_NO", setlinfo.getStr("psn_no"));
                 hisMap.put("PSN_NAME", setlinfo.getStr("psn_name"));
                 hisMap.put("PSN_CERT_TYPE", setlinfo.getStr("psn_cert_type"));
-                hisMap.put("CERTNO", setlinfo.getStr("certno"));
+                String certno = setlinfo.getStr("certno");
+                if (certno != null && !"".equals(certno)) {
+                    hisMap.put("CERTNO", "'" + certno + "'");
+                }
                 hisMap.put("GEND", setlinfo.getStr("gend"));
                 if (setlinfo.getStr("naty") != null && !"".equals(setlinfo.getStr("naty"))) {
                     naty = setlinfo.getStr("naty").toString();
@@ -1708,6 +1711,7 @@ public class YbServiceImpl implements YbService {
                 if (pendingDelayedTasks.add(hospOutTradeNo)) {
                     scheduledExecutor.schedule(() -> {
                         try {
+                            log.info("用户退出流程，启用延时执行findStatus方法，写入His");
                             findStatus(hospOutTradeNo);
                         } catch (Exception e) {
                             log.error("延时执行findStatus异常", e);