修改bug

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

@@ -2076,7 +2076,7 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            String operatorId = "HLWYY";
            String operatorName = "互联网医院";
            String termNo = "DSYYHLWYY";
            JSONObject rsObj = confirmPayGjybToHospital(ylzMedicalRelationDO.getCardNo(),ylzMedicalRelationDO.getLogNo(),depositAmount,outChargeNo, operatorId,operatorName,termNo);
            JSONObject rsObj = confirmPayGjybToHospital(ylzMedicalRelationDO.getCardNo(),ylzMedicalRelationDO.getLogNo(),depositAmount,ylzMedicalRelationDO.getId(), operatorId,operatorName,termNo);
            logger.info("rsObj");
            boolean flag = true;
            if (rsObj!=null){

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

@@ -2004,6 +2004,51 @@ public class DsyyEntranceService {
    }
    /**
     * 16结算结果查询
     * @param cardNo
     * @param outChargeNo
     * @return
     * @throws Exception
     */
    public String queryMedicalPay(String cardNo,String outChargeNo) throws  Exception{
        String api = "query_medical_pay";
        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(outChargeNo)){
            object.put("outChargeNo",outChargeNo);
        }
        condition = object.toJSONString();
        String msgBody =condition;
        Map<String,String> params = new HashedMap();
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("query_medical_pay params:"+params.toString());
        String xml = getDsyyWebServiceInfo("CallInterface",params,getOperateUrl());
        WlyyHttpLogDO wlyyHttpLogDO = new WlyyHttpLogDO();
        wlyyHttpLogDO.setRequest(params.toString());
        wlyyHttpLogDO.setCode("query_medical_pay");
        wlyyHttpLogDO.setName("3.16结算结果查询");
        wlyyHttpLogDO.setResponse(xml);
        wlyyHttpLogDO.setCreateTime(new Date());
        wlyyHttpLogDao.save(wlyyHttpLogDO);
        logger.info(" query_medical_pay json:"+xml);
        return xml;
    }
    /**
     * 查询院内卡列表
     *

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

@@ -227,6 +227,16 @@ public class DsyyController extends EnvelopRestEndpoint {
    }
    @PostMapping(value = "/queryMedicalPay")
    @ApiOperation(value = "结算结果查询")
    public ObjEnvelop queryMedicalPay(@ApiParam(name = "cardNo", value = "卡号", required = false)
                                     @RequestParam(value = "cardNo",required = false)String cardNo,
                                     @ApiParam(name = "outChargeNo", value = "平台结算流水号", required = false)
                                     @RequestParam(value = "outChargeNo",required = false)String outChargeNo) throws Exception {
        return success("请求成功",dsyyEntranceService.queryMedicalPay(cardNo,outChargeNo));
    }
    @PostMapping(value = "/queryCardList")
    @ApiOperation(value = "查询院内卡列表")
    public ObjEnvelop queryCardList(@ApiParam(name = "userName", value = "姓名", required = false)