第三医院版本开发

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

@@ -1480,20 +1480,18 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        if (expressageDO!=null){
            if (expressageDO.getOneselfPickupFlg()==0){
                Object result=getSFExpressInfoNew(registerNo,realorder,"");
                logger.info("顺丰下单完成信息=="+result.toString());
                String re = result.toString();
                if (re!=null){
                    JSONObject object = JSONObject.parseObject(re);
                    if (object.getString("code").equalsIgnoreCase("SUCCESS"));
                    JSONArray jsonArray = object.getJSONArray("result");
                    JSONObject jsonObject = jsonArray.getJSONObject(0);
                    String sfOrder = jsonObject.getString("mainMailNo");
                    String sfOrder = object.getString("mainMailNo");
                    String address = expressageDO.getProvinceName()+expressageDO.getCityName()+expressageDO.getTownName()+expressageDO.getStreetName()+expressageDO.getAddress();
                    String phone = expressageDO.getMobile();
                    String remark = expressageDO.getRemark();
                    String cardNo = outpatientDO.getCardNo();
                    String isExpress = "是";
                    String isExpress = "1";
                    if (expressageDO.getOneselfPickupFlg()==1){
                        isExpress = "否";
                        isExpress = "0";
                    }
                    return  sendDispensingToHisToHospital(registerNo,cardNo,isExpress,sfOrder,address,phone,remark);
                }else {
@@ -1551,20 +1549,6 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                            //处方已下单成功
                            System.out.println("获取顺丰物流面单信息:4");
                        } else {
                            //如果该处方的快递单号未生成，则继续下单
                            //根据业务订单号判断是否已经下单成功
                            //--2020.05.20--顺丰V2.0接口已不提供查询接口，直接单下单--START
//                    boolean go_on = sfexpressService.sfOrderSearchService(sfexpress_obj);
//
//                    //如果该业务订单号未下单成功过，则重新下单
//                    if(go_on){
//                        //请求顺丰接口下单，成功下单后，返回快递单号
//                        sfexpress_obj = sfexpressService.postSFOrderService(sfexpress_obj);
//                        //保存快递单号和增加处方物流记录为配送
//                        sfexpressService.updatePrescriptionExpressage(sfexpress_obj);
//                    }
                            //--2020.05.20--顺丰V2.0接口已不提供查询接口，直接单下单--END
                            //请求顺丰接口下单，成功下单后，返回快递单号
                            sfexpress_obj = sfexpressService.postSFOrderService(sfexpress_obj);
                            System.out.println("获取顺丰物流面单信息:5");
@@ -1579,35 +1563,6 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                            com.alibaba.fastjson.JSONObject object = sfexpressService.postSFOrderQueryService(sfexpress_obj);
                            System.out.println("获取顺丰物流面单信息7-1"+object.toJSONString());
                            System.out.println("获取顺丰物流面单信息:7");
                            /* com.alibaba.fastjson.JSONObject sfJsonObject = new com.alibaba.fastjson.JSONObject();*/
                    /*sfJsonObject.put("mailno", sfexpress_obj.getMailno());
                    sfJsonObject.put("mailtype", "标准快递");
                    sfJsonObject.put("destcode", object.getString("destRouteLabel"));
                    if (wxId.equalsIgnoreCase("xm_zsyy_wx")) {
                        sfJsonObject.put("j_name", "厦门大学附属中山医院");
                        sfJsonObject.put("j_phone", "4003008888");
                        sfJsonObject.put("j_townName", "思明区");
                        sfJsonObject.put("j_address", "湖滨南路201-209号");
                    } else if (wxId.equalsIgnoreCase("xm_ykyy_wx")) {
                        sfJsonObject.put("j_name", "厦门大学附属中山医院");
                        sfJsonObject.put("j_phone", "4003008888");
                        sfJsonObject.put("j_townName", "思明区");
                        sfJsonObject.put("j_address", "湖滨南路201-209号");
                    }
                    sfJsonObject.put("j_provinceName", "福建省");
                    sfJsonObject.put("j_cityName", "厦门市");
                    sfJsonObject.put("d_name", sfexpress_obj.getName());
                    sfJsonObject.put("d_provinceName", sfexpress_obj.getProvinceName());
                    sfJsonObject.put("d_cityName", sfexpress_obj.getCityName());
                    sfJsonObject.put("d_townName", sfexpress_obj.getTownName());
                    sfJsonObject.put("d_address", sfexpress_obj.getAddress());
                    sfJsonObject.put("d_phone", sfexpress_obj.getMobile());
                    sfJsonObject.put("express_type", 11);
                    sfJsonObject.put("pay_method", 2);
                    sfJsonObject.put("receive_time", "");
                    sfJsonObject.put("dispensaryType", 2);*/
                            result = object;
                            System.out.println("获取顺丰物流面单信息:8");
                        }
@@ -1885,6 +1840,7 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                outChargeNo = businessOrderDO.getTraceNo();
                orderNo = businessOrderDO.getOrderNo();
            }
            if (ylzMedicalRelationDO.getMedicalState()==null||(ylzMedicalRelationDO.getMedicalState()!=null&&ylzMedicalRelationDO.getMedicalState()==0)){
                String sql = "update SST_JSDP_JBXX_GJYB\n" +
                        "   set SETL_ID           = '', \n" +
@@ -1990,6 +1946,9 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                String res = updateUrl(sql);
                logger.info("结算成功更新日志："+res);
            }
            if (!StringUtils.isNoneBlank(outChargeNo)){
                outChargeNo=ylzMedicalRelationDO.getHisBillSerial();
            }
            String operatorId = "HLWYY";
            String operatorName = "互联网医院";
            String termNo = "DSYYHLWYY";

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

@@ -1718,12 +1718,16 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                businessOrderDO.setOrderNo("HLWYY"+System.currentTimeMillis()+(int)(Math.random()*900)+100);
                businessOrderDO.setDepositType(depositType);
                businessOrderDao.save(businessOrderDO);
                List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wechatId,wlyyOutpatientDO.getConsumer());
                if (patientWechatDos!=null&&patientWechatDos.size()!=0){
                    BasePatientWechatDo patientWechatDo = patientWechatDos.get(0);
                    openId = patientWechatDo.getOpenid();
                if(depositType.equalsIgnoreCase("WX_MIN")){
                    openId = patientDO.getOpenid();
                }else {
                    throw new Exception("请关注“海沧医院”公众号，点击互联网医院-在线诊室进行结算！");
                    List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wechatId,wlyyOutpatientDO.getConsumer());
                    if (patientWechatDos!=null&&patientWechatDos.size()!=0){
                        BasePatientWechatDo patientWechatDo = patientWechatDos.get(0);
                        openId = patientWechatDo.getOpenid();
                    }else {
                        throw new Exception("请关注“第三医院”公众号，点击互联网医院-在线诊室进行结算！");
                    }
                }
                String price = businessOrderDO.getPayPrice().toString();
                String notifyUrl = hospitalSysDictDO.getDictCode();
@@ -1804,10 +1808,16 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                businessOrderDO.setCreateTime(new Date());
                businessOrderDO.setUpdateTime(new Date());
                businessOrderDao.save(businessOrderDO);
                List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wechatId,businessOrderDO.getPatient());
                if (patientWechatDos!=null&&patientWechatDos.size()!=0){
                    BasePatientWechatDo patientWechatDo = patientWechatDos.get(0);
                    openId = patientWechatDo.getOpenid();
                if(depositType.equalsIgnoreCase("WX_MIN")){
                    openId = patientDO.getOpenid();
                }else {
                    List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wechatId,wlyyOutpatientDO.getConsumer());
                    if (patientWechatDos!=null&&patientWechatDos.size()!=0){
                        BasePatientWechatDo patientWechatDo = patientWechatDos.get(0);
                        openId = patientWechatDo.getOpenid();
                    }else {
                        throw new Exception("请关注“第三医院”公众号，点击互联网医院-在线诊室进行结算！");
                    }
                }
                String price = businessOrderDO.getPayPrice().toString();
                String notifyUrl = hospitalSysDictDO.getDictCode();
@@ -2121,10 +2131,16 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            businessOrderDO.setOrderNo("HLWYY"+System.currentTimeMillis()+(int)(Math.random()*900)+100);
            businessOrderDO.setDepositType(depositType);
            businessOrderDao.save(businessOrderDO);
            List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wechatId,businessOrderDO.getPatient());
            if (patientWechatDos!=null&&patientWechatDos.size()!=0){
                BasePatientWechatDo patientWechatDo = patientWechatDos.get(0);
                openId = patientWechatDo.getOpenid();
            if(depositType.equalsIgnoreCase("WX_MIN")){
                openId = patientDO.getOpenid();
            }else {
                List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wechatId,wlyyOutpatientDO.getConsumer());
                if (patientWechatDos!=null&&patientWechatDos.size()!=0){
                    BasePatientWechatDo patientWechatDo = patientWechatDos.get(0);
                    openId = patientWechatDo.getOpenid();
                }else {
                    throw new Exception("请关注“第三医院”公众号，点击互联网医院-在线诊室进行结算！");
                }
            }
            String price = businessOrderDO.getPayPrice().toString();
            String notifyUrl = hospitalSysDictDO.getDictCode();
@@ -2311,10 +2327,16 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            businessOrderDO.setCreateTime(new Date());
            businessOrderDO.setUpdateTime(new Date());
            businessOrderDao.save(businessOrderDO);
            List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wechatId,businessOrderDO.getPatient());
            if (patientWechatDos!=null&&patientWechatDos.size()!=0){
                BasePatientWechatDo patientWechatDo = patientWechatDos.get(0);
                openId = patientWechatDo.getOpenid();
            if(depositType.equalsIgnoreCase("WX_MIN")){
                openId = patientDO.getOpenid();
            }else {
                List<BasePatientWechatDo> patientWechatDos = patientWechatDao.findByWechatIdAndPatientId(wechatId,wlyyOutpatientDO.getConsumer());
                if (patientWechatDos!=null&&patientWechatDos.size()!=0){
                    BasePatientWechatDo patientWechatDo = patientWechatDos.get(0);
                    openId = patientWechatDo.getOpenid();
                }else {
                    throw new Exception("请关注“第三医院”公众号，点击互联网医院-在线诊室进行结算！");
                }
            }
            String price = businessOrderDO.getPayPrice().toString();
            String notifyUrl = hospitalSysDictDO.getDictCode();

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -336,6 +336,8 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        //图形验证码验证
        String key = parameters.get("key");
        String text = parameters.get("text");
        String appletCode = parameters.get("appletCode");
        logger.info("appletCode"+appletCode);
        if (org.apache.commons.lang3.StringUtils.isNotBlank(key) && org.apache.commons.lang3.StringUtils.isNotBlank(text)) {
            if (!verifyCaptcha(key, text)) {
                System.out.println("");
@@ -517,6 +519,16 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        baseLoginLogService.save(baseLoginLogDO);
        logger.info("login:登录进入10");
        WxWechatDO wxWechatDO = wechatDao.findById(wechatId).get();
        String appletOpenid = null;
        if (!StringUtils.isEmpty(appletCode)){
            Map<String,Object> objectMap = checkApplets(appletCode,wxWechatDO.getApplets(),wxWechatDO.getAppletsSecret());
            if (objectMap!=null){
                appletOpenid = objectMap.get("openid").toString();
                userDetailsService.updateOpenId(appletOpenid, wlyyUserSimple.getId());
            }
        }
        //个推 clientId
        String clientId = parameters.get("getuiClientId");
        String getuiClientType = parameters.get("getuiClientType");