Kaynağa Gözat

中山医院问题排查

wangzhinan 11 ay önce
ebeveyn
işleme
48aa339113

+ 22 - 24
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionExpressageService.java

@ -572,32 +572,29 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
        String signLocal = SHAUtils.SHA512(signStr);
        String signLocal = SHAUtils.SHA512(signStr);
        logger.info("signStr"+signLocal);
        logger.info("signStr"+signLocal);
        String sign = object.getString("sign");
        String sign = object.getString("sign");
        if (signLocal.equalsIgnoreCase(sign)){
            sflog.setAcceptTime(DateUtil.stampToDate(accept_time));
            sflog.setAcceptAddress(accept_address);
            sflog.setAcceptRemark(accept_remark);
            sflog.setOpCode(opcode);
            sflog.setExpressageId(orderid);
            sflog.setId(UUID.randomUUID().toString());
            sflog.setCreateTime(new Date());
            if(wayroutlsit.keySet().contains(mailno)){
                wayroutlsit.get(mailno).add(sflog);
            }else{
                List<WlyyPrescriptionExpressageLogDO> newsflogs = new ArrayList<>();
                newsflogs.add(sflog);
                wayroutlsit.put(mailno,newsflogs);
            }
        sflog.setAcceptTime(DateUtil.stampToDate(accept_time));
        sflog.setAcceptAddress(accept_address);
        sflog.setAcceptRemark(accept_remark);
        sflog.setOpCode(opcode);
        sflog.setExpressageId(orderid);
        sflog.setId(UUID.randomUUID().toString());
        sflog.setCreateTime(new Date());
        if(wayroutlsit.keySet().contains(mailno)){
            wayroutlsit.get(mailno).add(sflog);
        }else{
            List<WlyyPrescriptionExpressageLogDO> newsflogs = new ArrayList<>();
            newsflogs.add(sflog);
            wayroutlsit.put(mailno,newsflogs);
        }
            if(!wayroutlsit.keySet().isEmpty()){
                for (String mailNo1:wayroutlsit.keySet()) {
                    List<WlyyPrescriptionExpressageLogDO> pushSFLogs = wayroutlsit.get(mailNo1);
                    //同一个快递单号的执行一个事务操作
                    this.saveSFPushRoutInfos(mailNo1,pushSFLogs);
                }
        if(!wayroutlsit.keySet().isEmpty()){
            for (String mailNo1:wayroutlsit.keySet()) {
                List<WlyyPrescriptionExpressageLogDO> pushSFLogs = wayroutlsit.get(mailNo1);
                //同一个快递单号的执行一个事务操作
                this.saveSFPushRoutInfos(mailNo1,pushSFLogs);
            }
            }
        }else {
            throw new Exception("签名无效");
        }
        }
    }
    }
    /**
    /**
@ -663,7 +660,8 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
            if(isContainEndRoutInfo){
            if(isContainEndRoutInfo){
                //修改处方状态为完成
                //修改处方状态为完成
                prescriptionDao.updateStatusByOutPatientId( 100,new Date(),sfexpress.getOutpatientId());
                prescriptionDao.updateStatusByOutPatientId( 100,new Date(),sfexpress.getOutpatientId());
                prescriptionService.electronicPrescriptionReceiving(sfexpress.getOutpatientId());
//                prescriptionService.electronicPrescriptionReceiving(sfexpress.getOutpatientId());
                /*List<WlyyPrescriptionDO> wlyyPrescriptionDOs = prescriptionDao.findByOutpatientId(sfexpress.getOutpatientId());
                /*List<WlyyPrescriptionDO> wlyyPrescriptionDOs = prescriptionDao.findByOutpatientId(sfexpress.getOutpatientId());
                if (wlyyPrescriptionDOs.size()>0){
                if (wlyyPrescriptionDOs.size()>0){
                    WlyyPrescriptionDO wlyyPrescriptionDO=wlyyPrescriptionDOs.get(0);
                    WlyyPrescriptionDO wlyyPrescriptionDO=wlyyPrescriptionDOs.get(0);

+ 1 - 1
svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/third/SfRoutePushController.java

@ -44,7 +44,7 @@ public class SfRoutePushController extends EnvelopRestEndpoint {
            sfexpressService.SFRoutePushService(content);
            sfexpressService.SFRoutePushService(content);
            return success(successxml);
            return success(successxml);
        }catch (Exception e){
        }catch (Exception e){
            logger.error("接收顺丰路由信息推送失败,入参xml:"+content);
            logger.error("接收顺丰路由信息推送失败,入参xml:"+e.getMessage());
            //日志文件中记录异常信息
            //日志文件中记录异常信息
            //返回接口异常信息处理结果
            //返回接口异常信息处理结果
            return failed(failedxml);
            return failed(failedxml);

+ 1 - 1
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@ -957,7 +957,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            sfexpressService.SFRoutePushServiceNew(param);
            sfexpressService.SFRoutePushServiceNew(param);
            return "SUCCESS";
            return "SUCCESS";
        }catch (Exception e){
        }catch (Exception e){
            logger.error("接收顺丰路由信息推送失败,入参WaybillRoute:"+param);
            logger.error("接收顺丰路由信息推送失败,入参WaybillRoute:"+e.getMessage());
            //日志文件中记录异常信息
            //日志文件中记录异常信息
            //返回接口异常信息处理结果
            //返回接口异常信息处理结果
            return "FALSE";
            return "FALSE";