挂号医保支付传递的参数调整

src/main/java/com/ynxbd/common/action/RecordAction.java

@@ -2,7 +2,6 @@ package com.ynxbd.common.action;
 
 import com.ynxbd.common.action.base.BaseAction;
 import com.ynxbd.common.bean.record.Record;
-import com.ynxbd.common.dao.ChronicDao;
 import com.ynxbd.common.dao.RecordDao;
 import com.ynxbd.common.result.Result;
 import com.ynxbd.common.result.ResultEnum;

src/main/java/com/ynxbd/common/action/pay/MedicalAction.java

@@ -43,7 +43,7 @@ public class MedicalAction extends BaseAction {
      * 用户信息获取 | 医保上传 | 医保支付下单
      */
     @Action("getFeeDetails")
-    public Result getFeeDetails(String callNo, String payCode, String openid, String qrCode, String patientId, String cardNo, String realName, BigDecimal totalFee, Boolean isTime, String ybAttrib, String ybBZCode, String ybBZName) {
+    public Result getFeeDetails(String callNo, String payCode, String openid, String qrCode, String patientId, String cardNo, String realName, BigDecimal totalFee, Boolean isSplitTime, String ybAttrib, String ybBZCode, String ybBZName) {
         try {
             log.info("[医保]上传明细下单 callNo={}, payCode={}, openid={}, qrCode={}, patientId={}, totalFee={}, ybAttrib={}, ybBZCode={}, ybBZName={}", callNo, payCode, openid, qrCode, patientId, totalFee, ybAttrib, ybBZCode, ybBZName);
             if (callNo == null || payCode == null || openid == null || qrCode == null || patientId == null || cardNo == null || totalFee == null) {
@@ -61,7 +61,7 @@ public class MedicalAction extends BaseAction {
                     if (!DateHelper.isToday(reg.getRegDate())) {
                         return Result.error("医保支付仅支持今日挂号");
                     }
-                    medicalInfo = MedicalService.regMdUploadFeeDetails(qrCode, openid, patientId, cardNo, realName, reg, isTime);
+                    medicalInfo = MedicalService.regMdUploadFeeDetails(qrCode, openid, patientId, cardNo, realName, reg, isSplitTime);
                     break;
 
                 case RECIPE:

src/main/java/com/ynxbd/common/dao/his/HisMedicalDao.java

@@ -77,9 +77,8 @@ public class HisMedicalDao {
     /**
      * [医保挂号]分时段挂号
      */
-    public static JsonResult regTimeMdUploadFeeDetails(Register reg, String payAuthNo, String cardNo, MerchantEnum merchantEnum, Boolean isTime) {
+    public static JsonResult regTimeMdUploadFeeDetails(Register reg, String payAuthNo, String cardNo, MerchantEnum merchantEnum, Boolean isSplitTime) {
-
+        if (isSplitTime) {
-        if (isTime) {
             return HisHelper.getMdJsonResult(HisEnum.AP_Regist_New, params -> {
                 params.put("PatientID", reg.getPatientId());
                 params.put("PayMoney", reg.getPayMoney());

src/main/java/com/ynxbd/common/service/MedicalService.java

@@ -41,13 +41,13 @@ public class MedicalService {
      * @param realName  真实姓名
      * @param reg       挂号信息
      */
-    public static MedicalInfo regMdUploadFeeDetails(String qrCode, String openid, String patientId, String cardNo, String realName, Register reg, Boolean isTime) throws ServiceException {
+    public static MedicalInfo regMdUploadFeeDetails(String qrCode, String openid, String patientId, String cardNo, String realName, Register reg, Boolean isSplitTime) throws ServiceException {
         MedicalUserInfo userInfo = WxMedicalHelper.getUserInfo(openid, qrCode, cardNo, realName);
 
         String payAuthNo = userInfo.getPayAuthNo();
 
         log.info("[医保]上传明细：patientId={}, cardNo={}, realName={}, reg={}", patientId, cardNo, realName, reg);
-        JsonResult result = HisMedicalDao.regTimeMdUploadFeeDetails(reg, payAuthNo, cardNo, MerchantEnum.WX, isTime);
+        JsonResult result = HisMedicalDao.regTimeMdUploadFeeDetails(reg, payAuthNo, cardNo, MerchantEnum.WX, isSplitTime);
         return mdPlaceOrder(payAuthNo, result);
     }