|
|
@ -4,20 +4,30 @@ import com.ynxbd.common.action.base.BaseAction; |
|
|
|
import com.ynxbd.common.bean.HisRecipe; |
|
|
|
import com.ynxbd.common.bean.HisRecipe; |
|
|
|
import com.ynxbd.common.bean.NatRecord; |
|
|
|
import com.ynxbd.common.bean.NatRecord; |
|
|
|
import com.ynxbd.common.bean.Patient; |
|
|
|
import com.ynxbd.common.bean.Patient; |
|
|
|
|
|
|
|
import com.ynxbd.common.bean.enums.MerchantEnum; |
|
|
|
|
|
|
|
import com.ynxbd.common.bean.pay.Recipe; |
|
|
|
import com.ynxbd.common.bean.xk.medicalRecipe; |
|
|
|
import com.ynxbd.common.bean.xk.medicalRecipe; |
|
|
|
import com.ynxbd.common.dao.NatRecordDao; |
|
|
|
import com.ynxbd.common.dao.NatRecordDao; |
|
|
|
import com.ynxbd.common.dao.PatientDao; |
|
|
|
import com.ynxbd.common.dao.PatientDao; |
|
|
|
import com.ynxbd.common.dao.his.HisRecipeDao; |
|
|
|
import com.ynxbd.common.dao.his.HisRecipeDao; |
|
|
|
|
|
|
|
import com.ynxbd.common.dao.peis.PeisDao; |
|
|
|
import com.ynxbd.common.helper.common.DateHelper; |
|
|
|
import com.ynxbd.common.helper.common.DateHelper; |
|
|
|
|
|
|
|
import com.ynxbd.common.helper.his.HisEnum; |
|
|
|
|
|
|
|
import com.ynxbd.common.helper.his.HisHelper; |
|
|
|
|
|
|
|
import com.ynxbd.common.result.JsonResult; |
|
|
|
import com.ynxbd.common.result.Result; |
|
|
|
import com.ynxbd.common.result.Result; |
|
|
|
import com.ynxbd.common.result.ResultEnum; |
|
|
|
import com.ynxbd.common.result.ResultEnum; |
|
|
|
|
|
|
|
import com.ynxbd.common.service.PeisService; |
|
|
|
import com.ynxbd.common.service.RecipeService; |
|
|
|
import com.ynxbd.common.service.RecipeService; |
|
|
|
|
|
|
|
import com.ynxbd.wx.config.WeChatConfig; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.struts2.convention.annotation.Action; |
|
|
|
import org.apache.struts2.convention.annotation.Action; |
|
|
|
import org.apache.struts2.convention.annotation.Namespace; |
|
|
|
import org.apache.struts2.convention.annotation.Namespace; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
|
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 处方 |
|
|
|
* 处方 |
|
|
@ -129,6 +139,47 @@ public class RecipeAction extends BaseAction { |
|
|
|
// }
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 预约体检his缴费 |
|
|
|
|
|
|
|
* @param treatNum 体检号 |
|
|
|
|
|
|
|
* @param payMoney 缴费金额 |
|
|
|
|
|
|
|
* @param payDate 缴费日期 |
|
|
|
|
|
|
|
* @param payTime 缴费时间 |
|
|
|
|
|
|
|
* @param bankTransNo bankTransNo |
|
|
|
|
|
|
|
* @param outTranNo outTranNo |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
@Action("peisHisPay") |
|
|
|
|
|
|
|
public Result peisHisPay(String treatNum,String payMoney,String payDate,String payTime,String bankTransNo,String outTranNo){ |
|
|
|
|
|
|
|
log.info("[体检预约请求his计费]treatNum-{},payMoney-{},payDate-{},payTime-{},bankTransNo-{},outTranNo-{}",treatNum,payMoney,payDate,payTime,bankTransNo,outTranNo); |
|
|
|
|
|
|
|
if("".equals(treatNum)||"".equals(outTranNo)){ |
|
|
|
|
|
|
|
return Result.error(ResultEnum.PARAM_IS_DEFECT); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Recipe recipe = new PeisDao().selectByOutTradeNo(outTranNo); |
|
|
|
|
|
|
|
if(recipe==null){ |
|
|
|
|
|
|
|
return Result.error(ResultEnum.DATA_NOT_FOUND); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(!recipe.getBankTransNo().equals(bankTransNo)){ |
|
|
|
|
|
|
|
log.info("[体检预约请求his计费]体检系统跟微信支付系统两笔订单不一致,体检系统:bankTransNo-{},微信系统:bankTransNo-{}",bankTransNo,recipe.getBankTransNo()); |
|
|
|
|
|
|
|
return Result.error(ResultEnum.DATA_IS_WRONG); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Map<String,Object> params = new HashMap<>(); |
|
|
|
|
|
|
|
params.put("MZNum", "0"); |
|
|
|
|
|
|
|
params.put("PatientID", "0"); |
|
|
|
|
|
|
|
params.put("TJBH",treatNum); |
|
|
|
|
|
|
|
params.put("GroupFlag","1"); |
|
|
|
|
|
|
|
params.put("PayMoney", payMoney); |
|
|
|
|
|
|
|
params.put("PayDate", payDate); |
|
|
|
|
|
|
|
params.put("PayTime", payTime); |
|
|
|
|
|
|
|
params.put("TransNo", recipe.getTradeNo()); |
|
|
|
|
|
|
|
params.put("PayDeviceID", "app"); |
|
|
|
|
|
|
|
params.put("PayWay", MerchantEnum.WX.HIS_PAY_WAY); |
|
|
|
|
|
|
|
params.put("BankTransNo", bankTransNo); // 商户订单号
|
|
|
|
|
|
|
|
params.put("OpenId", recipe.getOpenid()); |
|
|
|
|
|
|
|
params.put("Token", WeChatConfig.TOKEN); |
|
|
|
|
|
|
|
JsonResult result = HisHelper.getJsonResult(HisEnum.AP_Pay_Invoice, params, MerchantEnum.WX); |
|
|
|
|
|
|
|
return result.success()?Result.success(result):Result.error(result.getMessage()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 标准物价查询 |
|
|
|
* 标准物价查询 |
|
|
|
* |
|
|
|
* |
|
|
|