|
|
|
|
@ -36,7 +36,7 @@ public class HisMedDao { |
|
|
|
|
* @param recipeJson 处方json |
|
|
|
|
* @param totalFee 总金额 |
|
|
|
|
*/ |
|
|
|
|
public static JsonResult rxMedUploadDetails(MerchantEnum merchantEnum, String payAuthNo, String cardNo, String openid, String patientId, String treatNum, String recipeJson, BigDecimal totalFee, String ybAttrib, String ybBZCode, String ybBZName) { |
|
|
|
|
public static JsonResult rxMedUploadDetails(MerchantEnum merchantEnum, String openid, String payAuthNo, String cardNo, String patientId, String treatNum, String recipeJson, BigDecimal totalFee, String ybAttrib, String ybBZCode, String ybBZName) { |
|
|
|
|
List<Recipe> recipeList = JsonHelper.parseArray(recipeJson, Recipe.class); |
|
|
|
|
if (recipeList == null || recipeList.isEmpty()) { |
|
|
|
|
return HisFactory.His().createErrorResult("处方数量为 0 或 数据转换失败"); |
|
|
|
|
@ -69,16 +69,17 @@ public class HisMedDao { |
|
|
|
|
if (ObjectUtils.isNotEmpty(ybBZName)) { |
|
|
|
|
params.put("YBBZName", ybBZName); |
|
|
|
|
} |
|
|
|
|
return HisFactory.HisMed(merchantEnum).getJsonResult(HisEnum.AP_Pay_Invoice, params); |
|
|
|
|
|
|
|
|
|
return HisFactory.HisMed(merchantEnum, HisConfig.hasDevMedOpenId(openid, HisEnum.AP_Pay_Invoice)).getJsonResult(HisEnum.AP_Pay_Invoice, params); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [医保挂号]分时段挂号 |
|
|
|
|
*/ |
|
|
|
|
public static JsonResult regMedUploadDetails(MerchantEnum merchantEnum, Register reg, String payAuthNo, String cardNo, Boolean isSplitTime) { |
|
|
|
|
public static JsonResult regMedUploadDetails(MerchantEnum merchantEnum, String openid, Register reg, String payAuthNo, String cardNo, Boolean isSplitTime) { |
|
|
|
|
if (isSplitTime) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum).getJsonResult(HisEnum.AP_Regist_New, params -> { |
|
|
|
|
return HisFactory.HisMed(merchantEnum, HisConfig.hasDevMedOpenId(openid, HisEnum.AP_Regist_New)).getJsonResult(HisEnum.AP_Regist_New, params -> { |
|
|
|
|
params.put("PatientID", reg.getPatientId()); |
|
|
|
|
params.put("PayMoney", reg.getPayMoney()); |
|
|
|
|
|
|
|
|
|
@ -107,7 +108,7 @@ public class HisMedDao { |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
// 非分时段挂号 医保支付
|
|
|
|
|
return HisFactory.HisMed(merchantEnum).getJsonResult(HisEnum.AP_Regist, params -> { |
|
|
|
|
return HisFactory.HisMed(merchantEnum, HisConfig.hasDevMedOpenId(openid, HisEnum.AP_Regist)).getJsonResult(HisEnum.AP_Regist, params -> { |
|
|
|
|
params.put("PatientID", reg.getPatientId()); |
|
|
|
|
params.put("PayMoney", reg.getPayMoney()); |
|
|
|
|
params.put("DeptCode", reg.getDeptCode()); |
|
|
|
|
@ -138,8 +139,8 @@ public class HisMedDao { |
|
|
|
|
* [测试需调整] |
|
|
|
|
* 6201 上传费用明细(住院) + 6202 支付下单 |
|
|
|
|
*/ |
|
|
|
|
public static JsonResult outHospMedUploadDetails(MerchantEnum merchantEnum, String payAuthNo, String cardNo, String treatNum) { |
|
|
|
|
return HisFactory.His(true).getJsonResult(HisEnum.YDZF_UploadFeesInfo_ZY, params -> { |
|
|
|
|
public static JsonResult outHospMedUploadDetails(MerchantEnum merchantEnum, String openid, String payAuthNo, String cardNo, String treatNum) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum, HisConfig.hasDevMedOpenId(openid, HisEnum.YDZF_UploadFeesInfo_ZY)).getJsonResult(HisEnum.YDZF_UploadFeesInfo_ZY, params -> { |
|
|
|
|
params.put("ZYNum", treatNum); |
|
|
|
|
params.put("PayAuthNo", payAuthNo); |
|
|
|
|
}); |
|
|
|
|
@ -155,8 +156,8 @@ public class HisMedDao { |
|
|
|
|
* @param transNo HIS交易流水号 |
|
|
|
|
* @param bankTransNo HIS流水号 |
|
|
|
|
*/ |
|
|
|
|
public static JsonResult outHospMedPay(MerchantEnum merchantEnum, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee, String openId) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum, true).getJsonResult(HisEnum.YDZF_SaveToHIS_ZY, params -> { |
|
|
|
|
public static JsonResult outHospMedPay(MerchantEnum merchantEnum, String openid, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum, HisConfig.hasDevMedOpenId(openid, HisEnum.YDZF_SaveToHIS_ZY)).getJsonResult(HisEnum.YDZF_SaveToHIS_ZY, params -> { |
|
|
|
|
params.put("PayDeviceID", "mobile"); |
|
|
|
|
params.put("UserID_YBZF", mdUserId); |
|
|
|
|
params.put("PayMoney", cashFee); |
|
|
|
|
@ -168,7 +169,7 @@ public class HisMedDao { |
|
|
|
|
|
|
|
|
|
params.put("PayWay", "4"); |
|
|
|
|
params.put("Token", ""); |
|
|
|
|
params.put("OpenId", openId); |
|
|
|
|
params.put("OpenId", openid); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -183,8 +184,8 @@ public class HisMedDao { |
|
|
|
|
* @param transNo HIS交易流水号 |
|
|
|
|
* @param bankTransNo HIS流水号 |
|
|
|
|
*/ |
|
|
|
|
public static JsonResult regMedPay(MerchantEnum merchantEnum, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum).getJsonResult(HisEnum.Medical_PAY, params -> { |
|
|
|
|
public static JsonResult regMedPay(MerchantEnum merchantEnum, String openid, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum, HisConfig.hasDevMedOpenId(openid, HisEnum.Medical_PAY)).getJsonResult(HisEnum.Medical_PAY, params -> { |
|
|
|
|
params.put("UserID_YBZF", mdUserId); |
|
|
|
|
params.put("PayMoney", cashFee); |
|
|
|
|
params.put("PayDate", payDate); |
|
|
|
|
@ -202,8 +203,8 @@ public class HisMedDao { |
|
|
|
|
* |
|
|
|
|
* @param mdInfo 医保下单对象 |
|
|
|
|
*/ |
|
|
|
|
public static JsonResult placeMedOrder(MerchantEnum merchantEnum, MedicalInfo mdInfo) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum).getJsonResult(HisEnum.Medical_PayOrders, params -> { |
|
|
|
|
public static JsonResult placeMedOrder(MerchantEnum merchantEnum, String openid, MedicalInfo mdInfo) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum, HisConfig.hasDevMedOpenId(openid, HisEnum.Medical_PayOrders)).getJsonResult(HisEnum.Medical_PayOrders, params -> { |
|
|
|
|
// 授权码
|
|
|
|
|
params.put("PayAuthNo", mdInfo.getPayAuthNo()); |
|
|
|
|
// 授权token
|
|
|
|
|
@ -226,8 +227,8 @@ public class HisMedDao { |
|
|
|
|
* @param transNo HIS交易流水号 |
|
|
|
|
* @param bankTransNo HIS流水号 |
|
|
|
|
*/ |
|
|
|
|
public static JsonResult rxMedPay(MerchantEnum merchantEnum, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum).getJsonResult(HisEnum.Medical_PAY, params -> { |
|
|
|
|
public static JsonResult rxMedPay(MerchantEnum merchantEnum, String openid, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { |
|
|
|
|
return HisFactory.HisMed(merchantEnum, HisConfig.hasDevMedOpenId(openid, HisEnum.Medical_PAY)).getJsonResult(HisEnum.Medical_PAY, params -> { |
|
|
|
|
params.put("UserID_YBZF", mdUserId); |
|
|
|
|
params.put("PayMoney", cashFee); |
|
|
|
|
params.put("PayDate", payDate); |
|
|
|
|
|