Merge branch 'dev' of wujunjie/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/charge/OnePayService.java

@@ -341,7 +341,7 @@ public class OnePayService {
        chargePay.setCreateTime(formatDate.parse(outChargeTime));//接入应用内业务时间
        chargePay.setMedOrgNo(medOrgNo);//医疗机构编号
        chargePay.setMedOrgName(medOrgName);//医疗机构名称
        chargePay.setBillNo(billNo);//待结算费用单据号
        chargePay.setBillNo(billNo==null?billNo:billNo.trim());//待结算费用单据号
        chargePay.setSsc(cardNo);//医保卡号
        chargePay.setTotalAmount(Integer.parseInt(totalAmount));//交易总金额
        chargePay.setInsuranceAmount(Integer.parseInt(insuranceAmount));//医保支付金额
@@ -406,10 +406,10 @@ public class OnePayService {
            civilPay = response.getString("civilPay");
        }
        chargePay.setMiRegisterNo(miRegisterNo);//医保挂号
        chargePay.setMiCollectDate(miCollectDate);
        chargePay.setMiCollectTime(miCollectTime);
        chargePay.setMiSettleNo(miSettleNo);
        chargePay.setMiRegisterNo(miRegisterNo==null?miRegisterNo:miRegisterNo.trim());//医保挂号
        chargePay.setMiCollectDate(miCollectDate==null?miCollectDate:miCollectDate.trim());
        chargePay.setMiCollectTime(miCollectTime==null?miCollectTime:miCollectTime.trim());
        chargePay.setMiSettleNo(miSettleNo==null?miSettleNo:miSettleNo.trim());
        chargePay.setMiCollectStatus(miCollectStatus);
        chargePay.setMiRegisterStatus(miRegisterStatus);
        chargePay.setCadresPay(cadresPay);

patient-co/patient-co-wlyy-job/src/main/resources/application-test.yml

@@ -86,7 +86,7 @@ images:
sign:
  check_upload: http://172.19.103.85:8011/wlyy_service
  check_upload: http://172.19.103.88:8011/wlyy_service
quartz:

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/weixin/wxpay/service/OnePayService.java

@@ -846,7 +846,7 @@ public class OnePayService {
        chargePay.setCreateTime(formatDate.parse(outChargeTime));//接入应用内业务时间
        chargePay.setMedOrgNo(medOrgNo);//医疗机构编号
        chargePay.setMedOrgName(medOrgName);//医疗机构名称
        chargePay.setBillNo(billNo);//待结算费用单据号
        chargePay.setBillNo(billNo==null?billNo:billNo.trim());//待结算费用单据号
        chargePay.setSsc(cardNo);//医保卡号
        chargePay.setTotalAmount(Integer.parseInt(totalAmount));//交易总金额
        chargePay.setInsuranceAmount(Integer.parseInt(insuranceAmount));//医保支付金额
@@ -911,10 +911,10 @@ public class OnePayService {
            civilPay = response.getString("civilPay");
        }
        chargePay.setMiRegisterNo(miRegisterNo);//医保挂号
        chargePay.setMiCollectDate(miCollectDate);
        chargePay.setMiCollectTime(miCollectTime);
        chargePay.setMiSettleNo(miSettleNo);
        chargePay.setMiRegisterNo(miRegisterNo==null?miRegisterNo:miRegisterNo.trim());//医保挂号
        chargePay.setMiCollectDate(miCollectDate==null?miCollectDate:miCollectDate.trim());
        chargePay.setMiCollectTime(miCollectTime==null?miCollectTime:miCollectTime.trim());
        chargePay.setMiSettleNo(miSettleNo==null?miSettleNo:miSettleNo.trim());
        chargePay.setMiCollectStatus(miCollectStatus);
        chargePay.setMiRegisterStatus(miRegisterStatus);
        chargePay.setCadresPay(cadresPay);