眼科医保结算流程

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareService.java

@@ -1174,9 +1174,9 @@ public class HealthCareService {
     * @return
     * @throws Exception
     */
    public String register(String outpatientId) throws Exception{
    public String register(String outpatientId,String logNo) throws Exception{
        String funid = "N20.17.04.01";
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatient(outpatientId);
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLogNoAndOutpatientId(logNo,outpatientId);
        if (ylzMedicalRelationDO==null){
            throw new Exception("上传医保挂号失败：结算信息为空！");
        }
@@ -1317,9 +1317,9 @@ public class HealthCareService {
     * @return
     * @throws Exception
     */
    public String feeDetailUpload(String outpatientId) throws Exception{
    public String feeDetailUpload(String outpatientId,String logNo) throws Exception{
        String funid = "N20.17.04.03";
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatient(outpatientId);
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLogNoAndOutpatientId(logNo,outpatientId);
        if (ylzMedicalRelationDO==null){
            throw new Exception("医保费用明细上传：结算信息为空！");
        }
@@ -1491,9 +1491,9 @@ public class HealthCareService {
     * @return
     * @throws Exception
     */
    public YlzMedicalRelationDO preSettlement(String outpatientId) throws Exception{
    public YlzMedicalRelationDO preSettlement(String outpatientId,String logNo) throws Exception{
        String funid = "N20.17.04.05";
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatient(outpatientId);
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLogNoAndOutpatientId(logNo,outpatientId);
        if (ylzMedicalRelationDO==null){
            throw new Exception("医保费用明细上传：结算信息为空！");
        }
@@ -1753,10 +1753,10 @@ public class HealthCareService {
     * @return
     * @throws Exception
     */
    public String getSettlementResultUrl(String outpatientId) throws Exception{
    public String getSettlementResultUrl(String outpatientId,String logNo) throws Exception{
        String funid = "N20.17.04.07";
        JSONObject data = new JSONObject();
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatient(outpatientId);
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLogNoAndOutpatientId(logNo,outpatientId);
        if (ylzMedicalRelationDO==null){
            throw new Exception("获取医保结算页面地址：结算信息为空！");
        }
@@ -1840,10 +1840,10 @@ public class HealthCareService {
     * @return
     * @throws Exception
     */
    public String getSettlementResultUrlBase64(String outpatientId) throws Exception{
    public String getSettlementResultUrlBase64(String outpatientId,String logNo) throws Exception{
        String funid = "N20.17.04.08";
        JSONObject data = new JSONObject();
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatient(outpatientId);
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLogNoAndOutpatientId(logNo,outpatientId);
        if (ylzMedicalRelationDO==null){
            throw new Exception("获取医保结算页面地址：结算信息为空！");
        }

business/base-service/src/main/java/com/yihu/jw/hospital/healthCare/YlzMedicailRelationDao.java

@@ -30,6 +30,10 @@ public interface YlzMedicailRelationDao extends PagingAndSortingRepository<YlzMe
    @Query("from YlzMedicalRelationDO a where a.logNo = ?1 ")
    YlzMedicalRelationDO findByLog_no(String logNo);
    @Query("from YlzMedicalRelationDO a where a.logNo = ?1 and a.relationCode = ?2 ")
    YlzMedicalRelationDO findByLogNoAndOutpatientId(String logNo,String outpatientId);
   /* @Query("from YlzMedicalRelationDO a where a.hisSerial = ?1 ")
    YlzMedicalRelationDO findByHisSerial(String hisSerial);*/

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

@@ -5239,19 +5239,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                if (hospitalSysDictDO!=null){
                    if (hospitalSysDictDO.getDictValue().equalsIgnoreCase("1")){
                        if ("9".equals(type)) {
                            contentMsg = "您发起的图文复诊已被您取消。已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                            contentMsg = "您发起的图文复诊已被您取消。已支付的"+outpatientDO.getFee()+"元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                            first = outpatientDO.getConsumerName() + "，您好！您的图文复诊已被您取消，您可重新发起";
                        }
                        if ("16".equals(type)) {
                            contentMsg =  "您发起的视频复诊已被您取消。已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                            contentMsg =  "您发起的视频复诊已被您取消。已支付的"+outpatientDO.getFee()+"元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                            first = outpatientDO.getConsumerName() + "，您好！您的视频复诊已被您取消，您可重新发起";
                        }
                        if ("1".equals(type)) {
                            contentMsg =  "您发起的图文咨询已被您取消。已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                            contentMsg =  "您发起的图文咨询已被您取消。已支付的"+outpatientDO.getFee()+"元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                            first = outpatientDO.getConsumerName() + "，您好！您的图文咨询已被您取消，您可重新发起";
                        }
                        if ("17".equals(type)) {
                            contentMsg = "您发起的视频咨询已被您取消。已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                            contentMsg = "您发起的视频咨询已被您取消。已支付的"+outpatientDO.getFee()+"元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                            first = outpatientDO.getConsumerName() + "，您好！您的视频咨询已被您取消，您可重新发起";
                        }
                        if ("12".equals(type)) {
@@ -7158,14 +7158,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }else {
            if("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
                if (flag){
                    sql += " and d.del='1' order by d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort+",dw.workTotal DESC";
                    sql += " and d.del='1'  order by d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort+",dw.workTotal DESC";
                }else{
                    sql += " and d.del='1' order by d.consult_status desc nulls last ,evaluate.score desc nulls last ,a.total " + consutlSort;
                    sql+=" NULLS LAST,\n" +
                            "\tD.id DESC,dw.workTotal DESC NULLS LAST";
                }
            }else {
                sql += " and d.del='1' order by dw.workTotal desc,d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort+"";
                sql += " and d.del='1' GROUP BY d.id order by dw.workTotal desc,d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort+"";
            }
        }
@@ -14837,7 +14837,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    object.put("getSettlementResultUrl",getSettlementResultUrl);
                }else if (flag==2){
                    logger.info("获取医保结算页面地址开始!");
                    String getSettlementResultUrlBase64 = healthCareService.getSettlementResultUrlBase64(outpatientId);
                    String getSettlementResultUrlBase64 = healthCareNewService.getSettlementResultUrlBase64(outpatientId);
                    logger.info("获取医保结算页面地址结束!");
                    object.put("getSettlementResultUrlBase64",getSettlementResultUrlBase64);
                }
@@ -14898,7 +14898,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                            ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                        }else {
                            if (StringUtils.isNoneBlank(ylzMedicalRelationDO.getDiseaseCode())){
                                throw new Exception("已存在医保结算记录，请先处理后再结算!");
                                object.put("code","403");
                                object.put("message","已存在医保结算记录，请先处理后再结算!");
                                return object;
                            }
                            ylzMedicalRelationDO.setStatus(0);
                            ylzMedicailRelationDao.save(ylzMedicalRelationDO);
@@ -14926,7 +14928,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        ylzMedicalRelationDO.setStatus(0);
                        ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                    }else {
                        throw new Exception(jsonObject.getString("cause"));
                        object.put("code","403");
                        object.put("message",jsonObject.getString("cause"));
                        return object;
                    }
                }
            }
@@ -14992,7 +14996,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    object.put("getSettlementResultUrl",getSettlementResultUrl);
                }else if (flag==2){
                    logger.info("获取医保结算页面地址开始!");
                    String getSettlementResultUrlBase64 = healthCareService.getSettlementResultUrlBase64(outpatientId);
                    String getSettlementResultUrlBase64 = healthCareNewService.getSettlementResultUrlBase64(outpatientId);
                    logger.info("获取医保结算页面地址结束!");
                    object.put("getSettlementResultUrlBase64",getSettlementResultUrlBase64);
                }
@@ -15045,47 +15049,41 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    BigDecimal b5 = new BigDecimal(object1.getString("yljz_pay"));
                    BigDecimal b6 = new BigDecimal(object1.getString("other_pay"));
                    String payDateStr = object1.getString("pay_date");
                    /*Date payDate = DateUtil.strToDate(payDateStr);
                    Date payDate = DateUtil.strToDate(payDateStr);
                    Date now = DateUtil.getDateShort(new Date());
                    if (payDate.compareTo(now)==0){
                        BigDecimal b7 = new BigDecimal(object1.getString("enterprise_supplement"));
                        Double price = b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).doubleValue();
                        if (Double.parseDouble(ylzMedicalRelationDO.getMedicalPrice())==price){
                            ylzMedicalRelationDO.setStatus(1);
                            ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                        }
                    }else {
                        ylzMedicalRelationDO.setStatus(0);
                        ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                    }*/
                    String valiFlag = object1.getString("vali_flag");
                    if (valiFlag.equalsIgnoreCase("1")){
                        BigDecimal b7 = new BigDecimal(object1.getString("enterprise_supplement"));
                        Double price = b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).doubleValue();
                        if (Double.parseDouble(ylzMedicalRelationDO.getMedicalPrice())==price){
                            ylzMedicalRelationDO.setStatus(1);
                            ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                        }else {
                            if (StringUtils.isNoneBlank(ylzMedicalRelationDO.getDiseaseCode())){
                                throw new Exception("已存在医保结算记录，请先处理后再结算!");
                        if (payDate.compareTo(now)==0){
                            BigDecimal b7 = new BigDecimal(object1.getString("enterprise_supplement"));
                            Double price = b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).doubleValue();
                            if (Double.parseDouble(ylzMedicalRelationDO.getMedicalPrice())==price){
                                ylzMedicalRelationDO.setStatus(1);
                                ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                            }else {
                                object.put("code","403");
                                object.put("message","已存在医保结算记录，请先处理后再结算!");
                                return object;
                            }
                            ylzMedicalRelationDO.setStatus(0);
                            ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                        }else {
                            object.put("code","403");
                            object.put("message","已存在医保结算记录，请先处理后再结算!");
                            return object;
                        }
                    }else {
                        ylzMedicalRelationDO.setStatus(0);
                        ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                    }
                }else {
                    if (jsonObject.getString("flag").equalsIgnoreCase("50204")){
                        ylzMedicalRelationDO.setStatus(0);
                        ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                    }else {
                        throw new Exception(jsonObject.getString("cause"));
                        object.put("code","403");
                        object.put("message",jsonObject.getString("cause"));
                        return object;
                    }
                }
            }
            if (ylzMedicalRelationDO!=null&&ylzMedicalRelationDO.getStatus()==1){
                net.sf.json.JSONObject object2 = entranceService.qutpatientBalance(outpatientDO.getCardNo(), false);
@@ -15118,27 +15116,28 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            if (ylzMedicalRelationDO==null){
                throw new Exception("无待结算信息");
            }
            logger.info("获取患者待结算信息结束!");
            if(outpatientDO!=null&&outpatientDO.getMedicalState().equalsIgnoreCase("1")){
                logger.info("医保挂号开始!");
                String register = healthCareService.register(outpatientId);
                String register = healthCareService.register(outpatientId,ylzMedicalRelationDO.getLogNo());
                logger.info("医保挂号结束!");
                logger.info("医保费用明细上传开始!");
                String feeDetailUpload= healthCareService.feeDetailUpload(outpatientId);
                String feeDetailUpload= healthCareService.feeDetailUpload(outpatientId,ylzMedicalRelationDO.getLogNo());
                logger.info("医保费用明细上传结束!");
                logger.info("医保预结算信息开始!");
                ylzMedicalRelationDO =  healthCareService.preSettlement(outpatientId);
                ylzMedicalRelationDO =  healthCareService.preSettlement(outpatientId,ylzMedicalRelationDO.getLogNo());
                logger.info("医保预结算信息结束!");
                if (flag==1){
                    logger.info("获取医保结算页面地址开始!");
                    String getSettlementResultUrl = healthCareService.getSettlementResultUrl(outpatientId);
                    String getSettlementResultUrl = healthCareService.getSettlementResultUrl(outpatientId,ylzMedicalRelationDO.getLogNo());
                    logger.info("获取医保结算页面地址结束!");
                    object.put("getSettlementResultUrl",getSettlementResultUrl);
                }else if (flag==2){
                    logger.info("获取医保结算页面地址开始!");
                    String getSettlementResultUrlBase64 = healthCareService.getSettlementResultUrlBase64(outpatientId);
                    String getSettlementResultUrlBase64 = healthCareService.getSettlementResultUrlBase64(outpatientId,ylzMedicalRelationDO.getLogNo());
                    logger.info("获取医保结算页面地址结束!");
                    object.put("getSettlementResultUrlBase64",getSettlementResultUrlBase64);
                }
@@ -15467,7 +15466,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    if (registerbackObj.getString("flag").equalsIgnoreCase("1")){
                        com.alibaba.fastjson.JSONObject encryptData2 = registerbackObj.getJSONObject("encrypt_data");
                        logger.info("医保挂号冲销成功！");
                        ylzMedicalRelationDO.setStatus(1);
                        ylzMedicalRelationDO.setStatus(0);
                        ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                    }
                }

business/base-service/src/main/java/com/yihu/jw/order/pay/ylz/YlzPayService.java

@@ -537,7 +537,7 @@ public class YlzPayService {
            e.printStackTrace(pw);
            error = sw.toString();
        }
        logService.saveHttpLog(isSuccess, "hop.trade.refund", "互联网预交金退款", "POST", null,param.toString(), jsonObject, error, logService.shoppatType);
        logService.saveHttpLog(isSuccess, "hop.trade.refund", "互联网预交金退款", "POST", null,JSONObject.toJSONString(param), jsonObject, error, logService.shoppatType);
        return jsonObject;
    }

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

@@ -154,7 +154,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "2.5.1医保挂号（N20.17.04.01）", notes = "2.5.1医保挂号（N20.17.04.01）")
    public ObjEnvelop register(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
                               @RequestParam(value = "outpatientId", required = true)String outpatientId)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.register(outpatientId));
        return ObjEnvelop.getSuccess("ok",healthCareService.register(outpatientId,null));
    }
    @GetMapping(value = "/registerBack")
@@ -167,8 +167,10 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/feeDetailUpload")
    @ApiOperation(value = " 2.5.3医保费用明细上传（N20.17.04.03）", notes = " 2.5.3医保费用明细上传（N20.17.04.03）")
    public ObjEnvelop feeDetailUpload(@ApiParam(name = "outpatientId", value = "挂号号", required = true)
                                      @RequestParam(value = "outpatientId", required = true)String outpatientId)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.feeDetailUpload(outpatientId));
                                      @RequestParam(value = "outpatientId", required = true)String outpatientId,
                                      @ApiParam(name = "logNo", value = "流水号", required = true)
                                      @RequestParam(value = "logNo", required = false)String logNo)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.feeDetailUpload(outpatientId,logNo));
    }
    @GetMapping(value = "/feeDetailRefund")
@@ -183,8 +185,10 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/preSettlement")
    @ApiOperation(value = " 2.5.5医保预结算服务（N20.17.04.05）", notes = " 2.5.5医保预结算服务（N20.17.04.05）")
    public ObjEnvelop preSettlement(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
                                    @RequestParam(value = "outpatientId", required = false)String outpatientId)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.preSettlement(outpatientId));
                                    @RequestParam(value = "outpatientId", required = false)String outpatientId,
                                    @ApiParam(name = "logNo", value = "流水号", required = true)
                                    @RequestParam(value = "logNo", required = false)String logNo)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.preSettlement(outpatientId,logNo));
    }
    @GetMapping(value = "/preSettlementRefund")
@@ -197,15 +201,19 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/getSettlementResultUrl")
    @ApiOperation(value = " 2.5.7获取医保结算页面地址（N20.17.04.07）", notes = " 2.5.7获取医保结算页面地址（N20.17.04.07）")
    public ObjEnvelop getSettlementResultUrl(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
                                             @RequestParam(value = "outpatientId", required = false)String outpatientId)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrl(outpatientId));
                                             @RequestParam(value = "outpatientId", required = false)String outpatientId,
                                             @ApiParam(name = "logNo", value = "流水号", required = true)
                                             @RequestParam(value = "logNo", required = false)String logNo)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrl(outpatientId,logNo));
    }
    @GetMapping(value = "/getSettlementResultUrlBase64")
    @ApiOperation(value = " 2.5.7获取医保结算页面地址（N20.17.04.08）", notes = " 2.5.7获取医保结算页面地址（N20.17.04.08）")
    public ObjEnvelop getSettlementResultUrlBase64(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
                                             @RequestParam(value = "outpatientId", required = false)String outpatientId)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrlBase64(outpatientId));
                                             @RequestParam(value = "outpatientId", required = false)String outpatientId,
                                                   @ApiParam(name = "logNo", value = "流水号", required = true)
                                                   @RequestParam(value = "logNo", required = false)String logNo)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrlBase64(outpatientId,logNo));
    }
    @GetMapping(value = "/getSettlementResult")

svr/svr-internet-hospital/pom.xml

@@ -11,7 +11,7 @@
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital-test</artifactId>
    <artifactId>svr-internet-hospital</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
@@ -268,7 +268,7 @@
    </dependencies>
    <build>
        <finalName>svr-internet-hospital-test</finalName>
        <finalName>svr-internet-hospital</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/healthCare/HealthCareEndPoint.java

@@ -453,7 +453,9 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    @PostMapping(value = "/register")
    @ApiOperation(value = "2.5.1医保挂号（N20.17.04.01）", notes = "2.5.1医保挂号（N20.17.04.01）")
    public ObjEnvelop register(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
                                     @RequestParam(value = "outpatientId", required = true)String outpatientId)throws Exception{
                                     @RequestParam(value = "outpatientId", required = true)String outpatientId,
                               @ApiParam(name = "logNo", value = "流水号", required = false)
                               @RequestParam(value = "logNo", required = false)String logNo)throws Exception{
        try {
            if (wechatId.equalsIgnoreCase("xm_xzzx_wx")) {
                String url = entranceHealthCareUrl + "register?outpatientId="+outpatientId;
@@ -465,7 +467,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
                    return ObjEnvelop.getError("调用内网接口失败："+jsonObject.getString("message"));
                }
            }else if (wechatId.equalsIgnoreCase("xm_zsyy_wx")){
                return ObjEnvelop.getSuccess("ok",healthCareService.register(outpatientId));
                return ObjEnvelop.getSuccess("ok",healthCareService.register(outpatientId,logNo));
            }else{
                return ObjEnvelop.getSuccess("ok",healthCareNewService.register(outpatientId));
            }
@@ -504,7 +506,9 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    @PostMapping(value = "/feeDetailUpload")
    @ApiOperation(value = " 2.5.3医保费用明细上传（N20.17.04.03）", notes = " 2.5.3医保费用明细上传（N20.17.04.03）")
    public ObjEnvelop feeDetailUpload(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
                                   @RequestParam(value = "outpatientId", required = true)String outpatientId)throws Exception{
                                   @RequestParam(value = "outpatientId", required = true)String outpatientId,
                                      @ApiParam(name = "logNo", value = "流水号", required = false)
                                      @RequestParam(value = "logNo", required = false)String logNo)throws Exception{
        try {
            if (wechatId.equalsIgnoreCase("xm_xzzx_wx")) {
                String url = entranceHealthCareUrl + "feeDetailUpload?outpatientId="+outpatientId;
@@ -516,7 +520,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
                    return ObjEnvelop.getError("调用内网接口失败："+jsonObject.getString("message"));
                }
            }else if (wechatId.equalsIgnoreCase("xm_zsyy_wx")){
                return ObjEnvelop.getSuccess("ok",healthCareService.feeDetailUpload(outpatientId));
                return ObjEnvelop.getSuccess("ok",healthCareService.feeDetailUpload(outpatientId,logNo));
            }else {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.feeDetailUpload(outpatientId));
            }
@@ -558,7 +562,9 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    @PostMapping(value = "/preSettlement")
    @ApiOperation(value = " 2.5.5医保预结算服务（N20.17.04.05）", notes = " 2.5.5医保预结算服务（N20.17.04.05）")
    public ObjEnvelop preSettlement(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
                                      @RequestParam(value = "outpatientId", required = false)String outpatientId)throws Exception{
                                      @RequestParam(value = "outpatientId", required = false)String outpatientId,
                                    @ApiParam(name = "logNo", value = "流水号", required = false)
                                    @RequestParam(value = "logNo", required = false)String logNo)throws Exception{
        try {
            if (wechatId.equalsIgnoreCase("xm_xzzx_wx")) {
                String url = entranceHealthCareUrl + "preSettlement?outpatientId="+outpatientId;
@@ -570,7 +576,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
                    return ObjEnvelop.getError("调用内网接口失败："+jsonObject.getString("message"));
                }
            }else if (wechatId.equalsIgnoreCase("xm_zsyy_wx")){
                return ObjEnvelop.getSuccess("ok",healthCareService.preSettlement(outpatientId));
                return ObjEnvelop.getSuccess("ok",healthCareService.preSettlement(outpatientId,logNo));
            }else {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.preSettlement(outpatientId));
            }
@@ -610,7 +616,9 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    @PostMapping(value = "/getSettlementResultUrl")
    @ApiOperation(value = " 2.5.7获取医保结算页面地址（N20.17.04.07）", notes = " 2.5.7获取医保结算页面地址（N20.17.04.07）")
    public ObjEnvelop getSettlementResultUrl(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
                                          @RequestParam(value = "outpatientId", required = false)String outpatientId)throws Exception{
                                          @RequestParam(value = "outpatientId", required = false)String outpatientId,
                                             @ApiParam(name = "logNo", value = "流水号", required = false)
                                             @RequestParam(value = "logNo", required = false)String logNo)throws Exception{
        try {
            if (wechatId.equalsIgnoreCase("xm_xzzx_wx")) {
                String url = entranceHealthCareUrl + "getSettlementResultUrl?outpatientId="+outpatientId;
@@ -622,7 +630,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
                    return ObjEnvelop.getError("调用内网接口失败："+jsonObject.getString("message"));
                }
            }else if (wechatId.equalsIgnoreCase("xm_zsyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrl(outpatientId));
                return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrl(outpatientId,logNo));
            }else {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.getSettlementResultUrl(outpatientId));
            }