代码提交

liusheng

昨天 459aa78c84cf552ebea6ef056d978c2531d71ac8

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

@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IPatArchiveService;
import com.smartor.service.IPatMedInhospService;
@@ -66,6 +67,8 @@

    @Autowired
    private RedisCache redisCache;
    @Autowired
    private PatArchivetagServiceImpl patArchivetagServiceImpl;


    /**
@@ -158,7 +161,7 @@
            patArchiveMapper.updatePatArchive(patArchive);
            if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
                //不需要服务了，需要通过patid和sendstate=2或者sendstate=1去查询一下，service_subtask里是否有正在执行的任务，有的话，立即停了
                ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
                ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
                serviceSubtaskVO.setPatid(patArchive.getId());
                serviceSubtaskVO.setSendstate(2L);
                List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
@@ -799,8 +802,62 @@
                patArchiveList.addAll(patArchives1);
            }
        }
//        //查询tagName
//        List<Long> patIds = patArchiveList.stream().map(PatArchiveOthreInfo::getId).distinct().collect(Collectors.toList());
//        Map<Long, String> patTagMap= patArchivetagMapper.getTagsByPatIds(patArchiveReq.getOrgid(),patIds);
//        //装配tagName
//        if(ObjectUtils.isNotEmpty(patTagMap)){
//            patArchiveList.forEach(patArchiveOthreInfo -> {
//                String tagName = patTagMap.get(patArchiveOthreInfo.getId());
//                if(StringUtils.isNotEmpty(tagName)){
//                    patArchiveOthreInfo.setTag(tagName);
//                }
//            });
//        }

        return patArchiveList;
    }

    /**
     * 获取患者信息(去重)
     *
     * @param patArchiveReq
     * @return
     */
//    @Override
    /**
     * 获取患者信息总数（去重）
     *
     * @param patArchiveReq
     * @return
     */
    @Override
    public Long getPatientInfoQCCount(PatArchiveReq patArchiveReq) {
        if (CollectionUtils.isEmpty(patArchiveReq.getLeavehospitaldistrictcodes()) || patArchiveReq.getLeavehospitaldistrictcodes().size() == 0) {
            patArchiveReq.setLeavehospitaldistrictcodes(null);
        }
        if (CollectionUtils.isEmpty(patArchiveReq.getLeaveldeptcodes()) || patArchiveReq.getLeaveldeptcodes().size() == 0) {
            patArchiveReq.setLeaveldeptcodes(null);
        }

        Long count = 0L;
        if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 1) {
            //  查看住院  1  查看门诊  2   查看体检  3    查看出院 4
            patArchiveReq.setCry(0);
            count = patArchiveMapper.countPatArchiveInfoByInhospQC(patArchiveReq);
        } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 2) {
            // 查看住院  1  查看门诊  2   查看体检  3 查看出院 4
            count = patArchiveMapper.countPatArchiveInfoByOuthospQC(patArchiveReq);
        } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 3) {
            //  查看住院  1  查看门诊  2   查看体检  3 查看出院 4
            count = patArchiveMapper.countPatArchiveInfoByPhysicalQC(patArchiveReq);
        } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 4) {
            //  查看住院  1  查看门诊  2   查看体检  3   查看出院 4
            patArchiveReq.setCry(1);
            count = patArchiveMapper.countPatArchiveInfoByInhospQC(patArchiveReq);
        }

        return count;
    }
}