From 15d583203608cdc23591eacf3d07df019af63e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= <absorber@absorber.local>
Date: Wed, 18 Oct 2023 10:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=A3=80=E9=A1=B9=E7=9B=AE=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ynxbd/common/dao/his/HisRecipeDao.java    | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java b/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java
index 428e86d..e645132 100644
--- a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java
+++ b/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java
@@ -175,21 +175,27 @@ public class HisRecipeDao {
             recipeIdsXml.append("<Id>").append(id).append("</Id>");
         }
 
-        return HisHelper.getJsonResult(HisEnum.AP_Pay_Invoice, params -> {
-            params.put("Recipe", recipeIdsXml.toString());
-
-            params.put("PatientID", patientId);
-            params.put("MZNum", treatNum);
-            params.put("PayMoney", payMoney);
-            params.put("PayDate", payDate);
-            params.put("PayTime", payTime);
-            params.put("TransNo", tradeNo);
-            params.put("PayDeviceID", payDeviceId);
-            params.put("PayWay", merchantEnum.HIS_PAY_WAY);
-            params.put("BankTransNo", fpOrderId); // 商户订单号
-            params.put("OpenId", openid);
-            params.put("Token", WeChatConfig.TOKEN);
-        },merchantEnum);
+        Map<String,Object> params = new HashMap<>();
+        params.put("Recipe", recipeIdsXml.toString());
+        params.put("PatientID", patientId);
+        params.put("MZNum", treatNum);
+        params.put("PayMoney", payMoney);
+        params.put("PayDate", payDate);
+        params.put("PayTime", payTime);
+        params.put("TransNo", tradeNo);
+        params.put("PayDeviceID", payDeviceId);
+        params.put("PayWay", merchantEnum.HIS_PAY_WAY);
+        params.put("BankTransNo", fpOrderId); // 商户订单号
+        params.put("OpenId", openid);
+        params.put("Token", WeChatConfig.TOKEN);
+        if(treatNum.contains("P-")){
+            log.info("[{}支付回调-体检，体检号-{}]",merchantEnum.NAME,treatNum);
+            params.put("MZNum", "0");
+            params.put("PatientID", "0");
+            params.put("TJBH",treatNum.split("-")[1]);
+            params.put("GroupFlag","1");
+        }
+        return HisHelper.getJsonResult(HisEnum.AP_Pay_Invoice, params,merchantEnum);
     }