Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 cbe903c4c4493715ad8d307107fb95975acfc975

 smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java

@@ -12,7 +12,9 @@
import com.smartor.common.LSHospTokenUtil;
import com.smartor.common.LyraTokenUtil;
import com.smartor.domain.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.BaseOrganizationMapper;
import com.smartor.mapper.PatArchiveMapper;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.service.IServiceTaskService;
import com.smartor.service.ISvyTaskSingleService;
@@ -47,6 +49,8 @@

    @Autowired
    private RedisCache redisCache;
    @Autowired
    private PatArchiveMapper patArchiveMapper;


    @Override
@@ -98,7 +102,7 @@
            iServiceTaskService.updateServiceTask(serviceTask2);

            //获取到该任务所有的服务，并从队列里删除
            ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
            ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
            serviceSubtaskVO.setTaskid(serviceTask2.getTaskid());
            serviceSubtaskVO.setSendstate(2L);
            List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
@@ -152,7 +156,7 @@
    public ServiceTaskVO queryTaskByCondition(ServiceSubtask serviceSubtask) {
        //定义患者与单一任务关联表集合
        List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
        ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
        serviceSubtaskVO.setTaskid(serviceSubtask.getTaskid());
        List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
        if (CollectionUtils.isEmpty(selectServiceSubtaskList) || selectServiceSubtaskList.size() == 0) {
@@ -283,7 +287,7 @@
        serviceSubtask.setCreateTime(new Date());
        serviceSubtask.setLeavehospitaldistrictcode(serviceTaskVO.getDistrictcode());
        //先查询一遍，该taskGuid是否存在
        ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
        serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
        List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
        if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
@@ -305,7 +309,10 @@
            log.error("360查询条件为空");
            throw new BaseException("360查询条件为空");
        }
        String token = LSHospTokenUtil.getToken(serviceQueryInfo.getXiaoXiTou().getFaSongJGID(),serviceQueryInfo.getUrl());
        String token = "";
        if(ObjectUtils.isNotEmpty(serviceQueryInfo.getUrl())){
            token = LSHospTokenUtil.getToken(serviceQueryInfo.getXiaoXiTou().getFaSongJGID(),serviceQueryInfo.getUrl());
        }

        //用户信息，通过ZuZhiJGID去bse_organization中获取机构信息
        if (StringUtils.isBlank(serviceQueryInfo.getYeWuXX().getYongHuXX().getZuZhiJGID()))
@@ -335,6 +342,20 @@
                result = OkHttpExample.sendPostRequest("https://9.0.124.104:13021/mediinfo-grus-fuwuzxwg/api/esb/lyraSyncRun", jsonString, token);
            }else if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47231022633110211A2101")) {  //中医院
                result = OkHttpExample.sendPostRequest("https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraSyncRun", jsonString, token);
            }else if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("1")) {  //杭州市一
                YeWuXX yeWuXX = serviceQueryInfo.getYeWuXX();
                BingRenXX bingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? yeWuXX.getBingRenXX() : null;
                PatArchive patArchive = new PatArchive();
                if (ObjectUtils.isNotEmpty(bingRenXX)) {
                    patArchive.setIdcardno(bingRenXX.getZhengJianHM());
                    if(ObjectUtils.isNotEmpty(patArchive.getIdcardno())){
                        List<PatArchive> patArchives = patArchiveMapper.selectPatArchiveList(patArchive);
                        if(CollectionUtils.isNotEmpty(patArchives)){
                            String patidHis = patArchives.get(0).getPatidHis();
                            result = OkHttpExample.getUnsafe("http://192.200.81.189:9100/blj/view?BINGRENID="+ patidHis +"&YONGHUID=DBA", token);
                        }
                    }
                }
            }else if(ObjectUtils.isNotEmpty(serviceQueryInfo.getUrl360())){
                result = OkHttpExample.sendPostRequest(serviceQueryInfo.getUrl360(), jsonString, token);
            }