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("").append(id).append(""); } - 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 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); }