第三医院版本开发

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DsyyPrescriptionService.java

@@ -283,14 +283,15 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        return prescriptionVOList;
    }
        /**
         * 通过身份证获取卡号
         *
         *
         * @param patient
         * @return
         * @throws Exception
         */
    /**
     * 通过身份证获取卡号
     *
     *
     * @param patient
     * @return
     * @throws Exception
     */
    public JSONArray findCardNo(String patient,boolean demoFlag) throws Exception {
        BasePatientDO patientDO = patientDao.getOne(patient);
        if (patientDO==null){
@@ -310,7 +311,7 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            rs.add(jsonObject);
            return rs;
        }
        patientMedicareCardDao.deleteByPatientId(patient);
        deleteCard(patient);
        JSONArray array = dsyyEntranceService.findCardNo(patientDO.getIdcard());
        for (int i=0;i<array.size();i++){
            JSONObject object = array.getJSONObject(i);
@@ -335,6 +336,10 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        return array;
    }
    public void deleteCard(String patient){
        patientMedicareCardDao.deleteByPatientId(patient);
    }
    /**
     * 获取诊断
     *
@@ -782,6 +787,120 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        return object;
    }
    /**
     *
     * 发起充值接口
     *
     * @param operatorId 操作人代码
     * @param operatorName 操作人姓名
     * @param termNo 终端编号
     * @param cardType 卡类型 01
     * @param cardNo 卡号 不为空
     * @param accountType 充值类型 01门诊 02住院
     * @param depositType 充值类型
     * @param channelType 渠道 CASH-现金 POS-pos机 ONE_CREDIT-信用就医 L-移动支付
     * @param amount 充值金额
     * @param outChargeNo 交易日志号
     * @param extra 备用参数
     * @param notes 备注说明
     * @param traceNo 平台唯一交易跟踪号
     * @param status 传空
     * @return
     * @throws Exception
     */
    public JSONObject startRechargeToHospital(String operatorId ,String operatorName,String termNo,String cardType,String cardNo,String accountType,
                                                     String depositType,String channelType,String amount,String outChargeNo,
                                                     String extra,String notes,String traceNo,String status) throws Exception {
        String url = entranceUrl +"startRecharge";
        JSONObject object = new JSONObject();
        Map<String,Object> params = new HashedMap();
        params.put("operatorId",operatorId);
        params.put("operatorName",operatorName);
        params.put("termNo",termNo);
        params.put("cardType",cardType);
        params.put("cardNo",cardNo);
        params.put("accountType",accountType);
        params.put("depositType",depositType);
        params.put("channelType",channelType);
        params.put("amount",amount);
        params.put("outChargeNo",outChargeNo);
        params.put("extra",extra);
        params.put("notes",notes);
        params.put("traceNo",traceNo);
        params.put("status",status);
        HttpResponse response = HttpUtils.doPost(url,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status1 = rs.getInteger("status");
        if (status1==200){
            if(rs.get("obj") instanceof JSONObject){
                object = rs.getJSONObject("obj");
            }else {
                throw new ServiceException(rs.getString("obj"));
            }
        }
        return object;
    }
    /**
     *
     * 充值确认接口
     *
     * @param operatorId 操作人代码
     * @param operatorName 操作人姓名
     * @param termNo 终端编号
     * @param cardType 卡类型 01
     * @param cardNo 卡号 不为空
     * @param accountType 充值类型 01门诊 02住院
     * @param depositType 充值类型
     * @param channelType 渠道 CASH-现金 POS-pos机 ONE_CREDIT-信用就医 L-移动支付
     * @param amount 充值金额
     * @param outChargeNo 交易日志号
     * @param extra 备用参数
     * @param notes 备注说明
     * @param traceNo 平台唯一交易跟踪号
     * @param status 传空
     * @return
     * @throws Exception
     */
    public JSONObject rechargeToHospital(String operatorId ,String operatorName,String termNo,String cardType,String cardNo,String accountType,
                                              String depositType,String channelType,String amount,String outChargeNo,
                                              String extra,String notes,String traceNo,String status) throws Exception {
        String url = entranceUrl +"recharge";
        JSONObject object = new JSONObject();
        Map<String,Object> params = new HashedMap();
        params.put("operatorId",operatorId);
        params.put("operatorName",operatorName);
        params.put("termNo",termNo);
        params.put("cardType",cardType);
        params.put("cardNo",cardNo);
        params.put("accountType",accountType);
        params.put("depositType",depositType);
        params.put("channelType",channelType);
        params.put("amount",amount);
        params.put("outChargeNo",outChargeNo);
        params.put("extra",extra);
        params.put("notes",notes);
        params.put("traceNo",traceNo);
        params.put("status",status);
        HttpResponse response = HttpUtils.doPost(url,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status1 = rs.getInteger("status");
        if (status1==200){
            if(rs.get("obj") instanceof JSONObject){
                object = rs.getJSONObject("obj");
            }else {
                throw new ServiceException(rs.getString("obj"));
            }
        }
        return object;
    }
    /**
     * 互联网医院通知院内摆药
     *

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java

@@ -1961,6 +1961,10 @@ public class DsyyEntranceService {
    }
    /**
     * 3.12住院申请单保存(门诊收入住院)
     *
@@ -2167,6 +2171,184 @@ public class DsyyEntranceService {
        return json;
    }
    /**
     * 发起充值接口
     *
     * @param operatorId 操作人代码
     * @param operatorName 操作人姓名
     * @param termNo 终端编号
     * @param cardType 卡类型 01
     * @param cardNo 卡号 不为空
     * @param accountType 充值类型 01门诊 02住院
     * @param depositType 充值类型
     * @param channelType 渠道 CASH-现金 POS-pos机 ONE_CREDIT-信用就医 L-移动支付
     * @param amount 充值金额
     * @param outChargeNo 交易日志号
     * @param extra 备用参数
     * @param notes 备注说明
     * @param traceNo 平台唯一交易跟踪号
     * @param status 传空
     * @return
     * @throws Exception
     */
    public String startRecharge(String operatorId ,String operatorName,String termNo,String cardType,String cardNo,String accountType,
                                       String depositType,String channelType,String amount,String outChargeNo,
                                       String extra,String notes,String traceNo,String status) throws  Exception{
        String api = "start_recharge";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
                "   <serverName>"+api+"</serverName>  " +
                "   <format>xml</format>" +
                "   <callOperator>"+operate+"</callOperator> " +
                "   <certificate>"+key+"</certificate> " +
                "   <orgCode>01</orgCode> " +
                "</root>";
        String condition ="";
        JSONObject object = new JSONObject();
        if (StringUtils.isNoneBlank(cardNo)){
            object.put("cardNo",cardNo);
        }
        if (StringUtils.isNoneBlank(operatorId)){
            object.put("operatorId",operatorId);
        }
        if (StringUtils.isNoneBlank(operatorName)){
            object.put("operatorName",operatorName);
        }
        if (StringUtils.isNoneBlank(termNo)){
            object.put("termNo",termNo);
        }
        if (StringUtils.isNoneBlank(cardType)){
            object.put("cardType",cardType);
        }
        if (StringUtils.isNoneBlank(accountType)){
            object.put("accountType",accountType);
        }
        if (StringUtils.isNoneBlank(depositType)){
            object.put("depositType",depositType);
        }
        if (StringUtils.isNoneBlank(channelType)){
            object.put("channelType",channelType);
        }
        if (StringUtils.isNoneBlank(amount)){
            object.put("amount",amount);
        }
        if (StringUtils.isNoneBlank(outChargeNo)){
            object.put("outChargeNo",outChargeNo);
        }
        if (StringUtils.isNoneBlank(extra)){
            object.put("extra",extra);
        }
        if (StringUtils.isNoneBlank(notes)){
            object.put("notes",notes);
        }
        if (StringUtils.isNoneBlank(traceNo)){
            object.put("traceNo",traceNo);
        }
        if (StringUtils.isNoneBlank(status)){
            object.put("status",status);
        }
        condition = object.toJSONString();
        String msgBody =condition;
        Map<String,String> params = new HashedMap();
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("startRecharge params:"+params.toString());
        String xml = getDsyyWebServiceInfo("CallInterface",params,getOperateUrl());
        logger.info(" startRecharge json:"+xml);
        return xml;
    }
    /**
     * 充值确认接口
     *
     * @param operatorId 操作人代码
     * @param operatorName 操作人姓名
     * @param termNo 终端编号
     * @param cardType 卡类型 01
     * @param cardNo 卡号 不为空
     * @param accountType 充值类型 01门诊 02住院
     * @param depositType 充值类型
     * @param channelType 渠道 CASH-现金 POS-pos机 ONE_CREDIT-信用就医 L-移动支付
     * @param amount 充值金额
     * @param outChargeNo 交易日志号
     * @param extra 备用参数
     * @param notes 备注说明
     * @param traceNo 平台唯一交易跟踪号
     * @param status 传空
     * @return
     * @throws Exception
     */
    public String recharge(String operatorId ,String operatorName,String termNo,String cardType,String cardNo,String accountType,
                                String depositType,String channelType,String amount,String outChargeNo,
                                String extra,String notes,String traceNo,String status) throws  Exception{
        String api = "recharge";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
                "   <serverName>"+api+"</serverName>  " +
                "   <format>xml</format>" +
                "   <callOperator>"+operate+"</callOperator> " +
                "   <certificate>"+key+"</certificate> " +
                "   <orgCode>01</orgCode> " +
                "</root>";
        String condition ="";
        JSONObject object = new JSONObject();
        if (StringUtils.isNoneBlank(cardNo)){
            object.put("cardNo",cardNo);
        }
        if (StringUtils.isNoneBlank(operatorId)){
            object.put("operatorId",operatorId);
        }
        if (StringUtils.isNoneBlank(operatorName)){
            object.put("operatorName",operatorName);
        }
        if (StringUtils.isNoneBlank(termNo)){
            object.put("termNo",termNo);
        }
        if (StringUtils.isNoneBlank(cardType)){
            object.put("cardType",cardType);
        }
        if (StringUtils.isNoneBlank(accountType)){
            object.put("accountType",accountType);
        }
        if (StringUtils.isNoneBlank(depositType)){
            object.put("depositType",depositType);
        }
        if (StringUtils.isNoneBlank(channelType)){
            object.put("channelType",channelType);
        }
        if (StringUtils.isNoneBlank(amount)){
            object.put("amount",amount);
        }
        if (StringUtils.isNoneBlank(outChargeNo)){
            object.put("outChargeNo",outChargeNo);
        }
        if (StringUtils.isNoneBlank(extra)){
            object.put("extra",extra);
        }
        if (StringUtils.isNoneBlank(notes)){
            object.put("notes",notes);
        }
        if (StringUtils.isNoneBlank(traceNo)){
            object.put("traceNo",traceNo);
        }
        if (StringUtils.isNoneBlank(status)){
            object.put("status",status);
        }
        condition = object.toJSONString();
        String msgBody =condition;
        Map<String,String> params = new HashedMap();
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("startRecharge params:"+params.toString());
        String xml = getDsyyWebServiceInfo("CallInterface",params,getOperateUrl());
        logger.info(" startRecharge json:"+xml);
        return xml;
    }
    //=============his webservice 调用结束=========================
    //========================集成平台调用开始===========================

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -1803,11 +1803,11 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        if(wxWechatDO==null){
            throw new Exception("can't find wechat:the wxId is "+wechatId);
        }
        WlyyHospitalSysDictDO hospitalSysDictDO =hospitalSysDictDao.findById("YLZ_NOTIFY_URL").orElse(null);
        WlyyHospitalSysDictDO hospitalSysDictDO =hospitalSysDictDao.findById("YLZ_NOTIFY_URL").get();
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(code);
        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(code).orElse(null);
        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(code).get();
        if (businessOrderDO!=null){
            BasePatientDO patientDO = patientDao.findById(businessOrderDO.getPatient()).orElse(null);
            BasePatientDO patientDO = patientDao.findById(businessOrderDO.getPatient()).get();
            String idcard = "";
            if (patientDO!=null){
                idcard = patientDO.getIdcard();
@@ -1818,7 +1818,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            if (StringUtils.isNoneBlank(businessOrderDO.getDoctor())){
                BaseDoctorDO doctorDO = doctorDao.findByIdAndDel(businessOrderDO.getDoctor());
                String fee = null;
                if (wechatId.equalsIgnoreCase("xm_zsyy_wx")||wechatId.equalsIgnoreCase("xm_xzzx_wx")||wechatId.equalsIgnoreCase("xm_hcyy_wx")){
                if (wechatId.equalsIgnoreCase("xm_zsyy_wx")||wechatId.equalsIgnoreCase("xm_xzzx_wx")||wechatId.equalsIgnoreCase("xm_hcyy_wx")||wechatId.equalsIgnoreCase("xm_dsyy_wx")){
                    if (wlyyOutpatientDO!=null){
                        if ("1".equalsIgnoreCase(wlyyOutpatientDO.getOutpatientType())&&"1".equalsIgnoreCase(wlyyOutpatientDO.getType())){
                            WlyyChargeDictDO chargeDictDO = chargeDictDao.findByChargeTypeAndDeptTypeCode(doctorDO.getTwfzChargeType(),"6");
@@ -1853,11 +1853,11 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                }
                doctorFee= Double.parseDouble(fee);
            }else {
                WlyyHospitalSysDictDO wlyyHospitalSysDictDO =hospitalSysDictDao.findById("WX_MONEY").orElse(null);
                WlyyHospitalSysDictDO wlyyHospitalSysDictDO =hospitalSysDictDao.findById("WX_MONEY").get();
                doctorFee = Double.parseDouble(wlyyHospitalSysDictDO.getDictValue());
            }
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO =hospitalSysDictDao.findById("YLZ_YE").orElse(null);
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO =hospitalSysDictDao.findById("YLZ_YE").get();
            if (wlyyHospitalSysDictDO!=null&&wlyyHospitalSysDictDO.getDictValue().equalsIgnoreCase("0")){
                businessOrderDO.setPayPrice(doctorFee);
            }else {
@@ -1900,6 +1900,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            }else if(wechatId.equalsIgnoreCase("xm_hcyy_wx")){
                operatorId = "hlwyy";
                operatorName = "互联网医院";
            }else if(wechatId.equalsIgnoreCase("xm_dsyy_wx")){
                operatorId = "1521";
                operatorName = "林福龙";
            }
            response = ylzPayService.recharge(operatorId,operatorName,cardType,"01",cardNo,idcard,depositType,price,businessOrderDO.getOrderNo(),openId,patientDO.getName(),notifyUrl);
            if (depositType.equalsIgnoreCase("WX_QR")){
@@ -2006,6 +2009,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            }else if(wechatId.equalsIgnoreCase("xm_hcyy_wx")){
                operatorId = "hlwyy";
                operatorName = "互联网医院";
            }else if(wechatId.equalsIgnoreCase("xm_dsyy_wx")){
                operatorId = "1521";
                operatorName = "林福龙";
            }
            response = ylzPayService.recharge(operatorId,operatorName,cardType,"01",cardNo,idcard,depositType,price,businessOrderDO.getOrderNo(),openId,patientDO.getName(),notifyUrl);
            if (depositType.equalsIgnoreCase("WX_QR")){
@@ -2084,6 +2090,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            }else if(wechatId.equalsIgnoreCase("xm_hcyy_wx")){
                operatorId = "hlwyy";
                operatorName = "互联网医院";
            }else if(wechatId.equalsIgnoreCase("xm_dsyy_wx")){
                operatorId = "1521";
                operatorName = "林福龙";
            }
            response = ylzPayService.recharge(operatorId,operatorName,cardType,"01",cardNo,idcard,depositType,price,businessOrderDO.getOrderNo(),openId,patientDO.getName(),notifyUrl);
            if (depositType.equalsIgnoreCase("WX_QR")){

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/DsyyController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
import com.yihu.jw.entity.hospital.prescription.WlyyInspectionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
import com.yihu.jw.hospital.prescription.service.entrance.DsyyEntranceService;
import com.yihu.jw.order.pay.ylz.YlzPayService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -29,6 +30,8 @@ public class DsyyController extends EnvelopRestEndpoint {
    @Autowired
    private DsyyEntranceService dsyyEntranceService;
    @Autowired
    private YlzPayService ylzPayService;
    @GetMapping(value = "/createSQLQuery")
    @ApiOperation(value = "视图统一查询")
@@ -310,6 +313,94 @@ public class DsyyController extends EnvelopRestEndpoint {
    }
    /**
     * 发起充值接口
     *
     * @param operatorId 操作人代码
     * @param operatorName 操作人姓名
     * @param termNo 终端编号
     * @param cardType 卡类型 01
     * @param cardNo 卡号 不为空
     * @param accountType 充值类型 01门诊 02住院
     * @param depositType 充值类型
     * @param channelType 渠道 CASH-现金 POS-pos机 ONE_CREDIT-信用就医 L-移动支付
     * @param amount 充值金额
     * @param outChargeNo 交易日志号
     * @param extra 备用参数
     * @param notes 备注说明
     * @param traceNo 平台唯一交易跟踪号
     * @param status 传空
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/startRecharge")
    @ApiOperation(value = "发起充值接口")
    public ObjEnvelop startRecharge(@ApiParam(name = "operatorId", value = "操作者id", required = false)
                                         @RequestParam(value = "operatorId",required = false)String operatorId,
                                         @ApiParam(name = "operatorName", value = "操作者姓名", required = false)
                                         @RequestParam(value = "operatorName",required = false)String operatorName,
                                         @ApiParam(name = "termNo", value = "终端编号", required = false)
                                         @RequestParam(value = "termNo",required = false)String termNo,
                                         @ApiParam(name = "cardType", value = "卡类型 01", required = false)
                                         @RequestParam(value = "cardType",required = false)String cardType,
                                         @ApiParam(name = "cardNo", value = "卡号", required = false)
                                         @RequestParam(value = "cardNo",required = false)String cardNo,
                                         @ApiParam(name = "accountType", value = "充值类型 01门诊 02住院", required = false)
                                         @RequestParam(value = "accountType",required = false)String accountType,
                                         @ApiParam(name = "depositType", value = "充值类型", required = false)
                                         @RequestParam(value = "depositType",required = false)String depositType,
                                         @ApiParam(name = "channelType", value = "渠道 CASH-现金 POS-pos机 ONE_CREDIT-信用就医 L-移动支付", required = false)
                                         @RequestParam(value = "channelType",required = false)String channelType,
                                         @ApiParam(name = "amount", value = "充值金额", required = false)
                                         @RequestParam(value = "amount",required = false)String amount,
                                         @ApiParam(name = "outChargeNo", value = "交易日志号", required = false)
                                             @RequestParam(value = "outChargeNo",required = false)String outChargeNo,
                                         @ApiParam(name = "extra", value = "备用参数", required = false)
                                             @RequestParam(value = "extra",required = false)String extra,
                                         @ApiParam(name = "notes", value = "备注说明", required = false)
                                             @RequestParam(value = "notes",required = false)String notes,
                                         @ApiParam(name = "traceNo", value = "平台唯一交易跟踪号", required = false)
                                             @RequestParam(value = "traceNo",required = false)String traceNo,
                                         @ApiParam(name = "status", value = "传空", required = false)
                                             @RequestParam(value = "status",required = false)String status) throws Exception {
        return success("请求成功",dsyyEntranceService.startRecharge(operatorId ,operatorName,termNo,cardType,cardNo,accountType,
                depositType,channelType,amount,outChargeNo,extra,notes,traceNo,status));
    }
    @PostMapping(value = "/recharge")
    @ApiOperation(value = "充值确认接口")
    public ObjEnvelop recharge(@ApiParam(name = "operatorId", value = "操作者id", required = false)
                                    @RequestParam(value = "operatorId",required = false)String operatorId,
                                    @ApiParam(name = "operatorName", value = "操作者姓名", required = false)
                                    @RequestParam(value = "operatorName",required = false)String operatorName,
                                    @ApiParam(name = "termNo", value = "终端编号", required = false)
                                    @RequestParam(value = "termNo",required = false)String termNo,
                                    @ApiParam(name = "cardType", value = "卡类型 01", required = false)
                                    @RequestParam(value = "cardType",required = false)String cardType,
                                    @ApiParam(name = "cardNo", value = "卡号", required = false)
                                    @RequestParam(value = "cardNo",required = false)String cardNo,
                                    @ApiParam(name = "accountType", value = "充值类型 01门诊 02住院", required = false)
                                    @RequestParam(value = "accountType",required = false)String accountType,
                                    @ApiParam(name = "depositType", value = "充值类型", required = false)
                                    @RequestParam(value = "depositType",required = false)String depositType,
                                    @ApiParam(name = "channelType", value = "渠道 CASH-现金 POS-pos机 ONE_CREDIT-信用就医 L-移动支付", required = false)
                                    @RequestParam(value = "channelType",required = false)String channelType,
                                    @ApiParam(name = "amount", value = "充值金额", required = false)
                                    @RequestParam(value = "amount",required = false)String amount,
                                    @ApiParam(name = "outChargeNo", value = "交易日志号", required = false)
                                    @RequestParam(value = "outChargeNo",required = false)String outChargeNo,
                                    @ApiParam(name = "extra", value = "备用参数", required = false)
                                    @RequestParam(value = "extra",required = false)String extra,
                                    @ApiParam(name = "notes", value = "备注说明", required = false)
                                    @RequestParam(value = "notes",required = false)String notes,
                                    @ApiParam(name = "traceNo", value = "平台唯一交易跟踪号", required = false)
                                    @RequestParam(value = "traceNo",required = false)String traceNo,
                                    @ApiParam(name = "status", value = "传空", required = false)
                                    @RequestParam(value = "status",required = false)String status) throws Exception {
        return success("请求成功",dsyyEntranceService.recharge(operatorId ,operatorName,termNo,cardType,cardNo,accountType,
                depositType,channelType,amount,outChargeNo,extra,notes,traceNo,status));
    }
    @PostMapping(value = "/sendDispensingToHis")
    @ApiOperation(value = "互联网医院通知院内摆药")
    public ObjEnvelop buildAccount(@ApiParam(name = "hISTradeNo", value = "必填，挂号流水号", required = false)
@@ -460,4 +551,38 @@ public class DsyyController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "/recharge")
    @ApiOperation(value = "七十三医院调用")
    public Envelop recharge(@ApiParam(name = "operatorId", value = "operatorId", required = false)
                            @RequestParam(value = "operatorId",required = false)String operatorId,
                            @ApiParam(name = "operatorName", value = "operatorName", required = false)
                            @RequestParam(value = "operatorName",required = false)String operatorName,
                            @ApiParam(name = "cardType", value = "cardType", required = false)
                            @RequestParam(value = "cardType",required = false)String cardType,
                            @ApiParam(name = "accountType", value = "accountType", required = false)
                                @RequestParam(value = "accountType",required = false)String accountType,
                            @ApiParam(name = "cardNo", value = "cardNo", required = false)
                                @RequestParam(value = "cardNo",required = false)String cardNo,
                            @ApiParam(name = "idNo", value = "idNo", required = false)
                                @RequestParam(value = "idNo",required = false)String idNo,
                            @ApiParam(name = "depositType", value = "depositType", required = false)
                                @RequestParam(value = "depositType",required = false)String depositType,
                            @ApiParam(name = "amount", value = "amount", required = false)
                                @RequestParam(value = "amount",required = false)String amount,
                            @ApiParam(name = "outChargeNo", value = "outChargeNo", required = false)
                                @RequestParam(value = "outChargeNo",required = false)String outChargeNo,
                            @ApiParam(name = "openId", value = "openId", required = false)
                                @RequestParam(value = "openId",required = false)String openId,
                            @ApiParam(name = "userName", value = "userName", required = false)
                                @RequestParam(value = "userName",required = false)String userName,
                            @ApiParam(name = "notifyUrl", value = "notifyUrl", required = false)
                                @RequestParam(value = "notifyUrl",required = false)String notifyUrl) throws Exception {
        try {
            return success(ylzPayService.recharge(operatorId,operatorName,cardType,accountType,cardNo,idNo,depositType,amount,outChargeNo,openId,userName,notifyUrl));
        }catch (Exception e){
            return Envelop.getError(e.getMessage());
        }
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -2154,11 +2154,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            @RequestParam(required = true) String cardType,
            @ApiParam(name = "cardNo", value = "cardNo", required = true)
            @RequestParam(required = true) String cardNo) throws Exception {
        try {
            return ObjEnvelop.getSuccess("ok", businessOrderService.ylzRechargeJson(relationCode, depositType, wxId, cardType, cardNo, demoFlag));
        } catch (Exception e) {
            return ObjEnvelop.getError(e.getMessage());
        }
        return ObjEnvelop.getSuccess("ok", businessOrderService.ylzRechargeJson(relationCode, depositType, wxId, cardType, cardNo, demoFlag));
    }
    /**