2、京颐支付接口和退费接口参数调整，金额转换为分存在异常处理。支付回调通知和退费回调通知参数接收调整。 3、新增枚举用于传递京颐支付的支付类型和业务类型。 4、处方缴费上传的患者信息数据，通过HIS的患者id查询。优先级为先查询本地数据，但是扫码支付可能存在未绑定进行支付的情况，防止数据缺失导致数据未上传。master_pay
parent
851dac15c5
commit
b93db00df9
22 changed files with 548 additions and 158 deletions
@ -0,0 +1,49 @@ |
||||
package com.ynxbd.common.action.pay; |
||||
|
||||
import com.ynxbd.jy.bean.enums.JYBusinessTypeEnum; |
||||
import com.ynxbd.jy.bean.enums.JYOrderTypeEnum; |
||||
import lombok.ToString; |
||||
|
||||
@ToString |
||||
public enum JYPSEnum { |
||||
NO(PEnum.NO, JYOrderTypeEnum._002, JYBusinessTypeEnum.B999), |
||||
|
||||
REG(PEnum.REG, JYOrderTypeEnum._001, JYBusinessTypeEnum.B101), |
||||
|
||||
RECIPE(PEnum.RECIPE, JYOrderTypeEnum._002, JYBusinessTypeEnum.B201), |
||||
|
||||
IN_HOSP(PEnum.IN_HOSP, JYOrderTypeEnum._003, JYBusinessTypeEnum.B301), |
||||
|
||||
OUT_HOSP(PEnum.OUT_HOSP, JYOrderTypeEnum._903, JYBusinessTypeEnum.B302), |
||||
|
||||
OL_REG(PEnum.OL_REG, JYOrderTypeEnum._001, JYBusinessTypeEnum.B101), |
||||
|
||||
MED_RECORD(PEnum.MED_RECORD, JYOrderTypeEnum._001, JYBusinessTypeEnum.B101), |
||||
|
||||
OUT_COLLECT(PEnum.OUT_COLLECT, JYOrderTypeEnum._012, JYBusinessTypeEnum.B999), |
||||
|
||||
TPP_QR_REG(PEnum.TPP_QR_REG, JYOrderTypeEnum._001, JYBusinessTypeEnum.B101), |
||||
|
||||
PEIS_RESERVE(PEnum.PEIS_RESERVE, JYOrderTypeEnum._904, JYBusinessTypeEnum.B999), |
||||
; |
||||
|
||||
public final PEnum PS; |
||||
public final JYOrderTypeEnum ORDER_TYPE; |
||||
public final JYBusinessTypeEnum BUSINESS_TYPE; |
||||
|
||||
JYPSEnum(PEnum PS, JYOrderTypeEnum ORDER_TYPE, JYBusinessTypeEnum BUSINESS_TYPE) { |
||||
this.PS = PS; |
||||
this.ORDER_TYPE = ORDER_TYPE; |
||||
this.BUSINESS_TYPE = BUSINESS_TYPE; |
||||
} |
||||
|
||||
public static JYPSEnum findEnum(PEnum ps) { |
||||
for (JYPSEnum item : JYPSEnum.values()) { |
||||
if (item.PS.equals(ps)) { |
||||
return item; |
||||
} |
||||
} |
||||
return NO; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,106 @@ |
||||
package com.ynxbd.common.bean.xk; |
||||
/* |
||||
* Copyright (c) 2022 |
||||
* User:Administrator |
||||
* File:XKMedicineDeliver.java |
||||
* Date:2022/12/01 13:58:01 |
||||
*/ |
||||
|
||||
import lombok.Getter; |
||||
import lombok.NoArgsConstructor; |
||||
import lombok.Setter; |
||||
import lombok.ToString; |
||||
|
||||
import java.math.BigDecimal; |
||||
import java.util.List; |
||||
|
||||
// 4.3.1.11 收费/退费 ChargeOrRefund
|
||||
@Getter |
||||
@Setter |
||||
@ToString |
||||
@NoArgsConstructor |
||||
public class XKChargeOrRefund { |
||||
private String callNo; |
||||
/** |
||||
* 患者就诊卡证类型 |
||||
*/ |
||||
private String idcardTypeCode; |
||||
/** |
||||
* 患者就诊卡证号码 |
||||
*/ |
||||
private String idcardNo; |
||||
/** |
||||
* 姓名 |
||||
*/ |
||||
private String name; |
||||
/** |
||||
* 性别代码 |
||||
*/ |
||||
private String genderCode; |
||||
/** |
||||
* 出生日期 |
||||
*/ |
||||
private String birthDate; |
||||
/** |
||||
* 门诊编号 |
||||
*/ |
||||
private String visitNo; |
||||
/** |
||||
* 结算序号 |
||||
*/ |
||||
private String accountNo; |
||||
/** |
||||
* 原结算序号 |
||||
*/ |
||||
private String originalAccountNo; |
||||
/** |
||||
* 支付平台订单号 |
||||
*/ |
||||
private String orderNo; |
||||
/** |
||||
* 总费用(元) |
||||
*/ |
||||
private BigDecimal totalFee; |
||||
/** |
||||
* 自付金额 (元) |
||||
*/ |
||||
private BigDecimal individualPay; |
||||
/** |
||||
* 收费/退费标志 |
||||
*/ |
||||
private String chargeRefundCode; |
||||
/** |
||||
* 医疗费用支付途径 |
||||
*/ |
||||
private String payTypeCode; |
||||
|
||||
/** |
||||
* 科室编码 |
||||
*/ |
||||
private String deptCode; |
||||
/** |
||||
* 科室名称 |
||||
*/ |
||||
private String deptName; |
||||
/** |
||||
* 科室对应诊疗科目编码 |
||||
*/ |
||||
private String deptClassCode; |
||||
/** |
||||
* 科室对应诊疗科目名称 |
||||
*/ |
||||
private String deptClassName; |
||||
/** |
||||
* 收费/退费日期时间 |
||||
*/ |
||||
private String rcdDatetime; |
||||
/** |
||||
* 收费明细 |
||||
*/ |
||||
private List<XKCostDetail> items; |
||||
|
||||
public boolean hasRefund() { |
||||
return "2".equals(this.chargeRefundCode); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,63 @@ |
||||
package com.ynxbd.common.bean.xk; |
||||
/* |
||||
* Copyright (c) 2022 |
||||
* User:Administrator |
||||
* File:XKMedicineDeliver.java |
||||
* Date:2022/12/01 13:58:01 |
||||
*/ |
||||
|
||||
import lombok.Getter; |
||||
import lombok.NoArgsConstructor; |
||||
import lombok.Setter; |
||||
import lombok.ToString; |
||||
|
||||
import java.math.BigDecimal; |
||||
|
||||
// 4.3.1.11.1 收费明细 CostDetail
|
||||
@Getter |
||||
@Setter |
||||
@ToString |
||||
@NoArgsConstructor |
||||
public class XKCostDetail { |
||||
/** |
||||
* 项目明细编号 |
||||
*/ |
||||
private String projDeno; |
||||
/** |
||||
* 项目名称 (包含药品) |
||||
*/ |
||||
private String projName; |
||||
/** |
||||
* 收费/退费标志 |
||||
*/ |
||||
private String chargeRefundCode; |
||||
/** |
||||
* 收费项目监管分类代码 |
||||
*/ |
||||
private String statCatCode; |
||||
/** |
||||
* 收费项目财务分类代码 |
||||
*/ |
||||
private String pinCatCode; |
||||
/** |
||||
* 是否属于门诊医保项目 |
||||
*/ |
||||
private String ifOutMedIns; |
||||
/** |
||||
* 项目数量 |
||||
*/ |
||||
private BigDecimal projCnt; |
||||
/** |
||||
* 项目单价 (元) |
||||
*/ |
||||
private BigDecimal projUnitPrice; |
||||
|
||||
/** |
||||
* 项目总价 (元) |
||||
*/ |
||||
private BigDecimal projAmount; |
||||
/** |
||||
* 项目自付金额 (元) |
||||
*/ |
||||
private BigDecimal individualPay; |
||||
} |
||||
Loading…
Reference in new issue