代码提交

liusheng

16 小时以前 ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd

 ruoyi-patarchive/src/main/java/com/ruoyi/patarchive/service/impl/PatArchiveServiceImpl.java

ÎļþÃû´Ó smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.smartor.service.impl;
package com.ruoyi.patarchive.service.impl;

import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
@@ -6,16 +6,12 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq;
import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
import com.ruoyi.inhospvisit.domain.PatMedInhosp;
import com.smartor.mapper.*;
import com.ruoyi.outpatientvisit.mapper.PatMedOuthospMapper;
import com.smartor.service.IPatArchiveService;
import com.smartor.service.IPatMedInhospService;
import com.smartor.service.IPatMedOuthospService;
import com.smartor.service.IPatMedPhysicalService;
import com.ruoyi.patarchive.service.IPatArchiveService;
import com.ruoyi.inhospvisit.api.InhospVisitFacade;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -50,6 +46,15 @@
import com.ruoyi.task.domain.entity.ServiceSubtaskEntity;
import com.ruoyi.task.domain.ServiceSubtask;
import com.ruoyi.task.mapper.ServiceSubtaskMapper;
import com.ruoyi.patarchive.mapper.PatArchiveMapper;
import com.ruoyi.patarchive.domain.PatArchiveOthreInfo;
import com.ruoyi.patarchive.domain.PatArchiveReq;
import com.ruoyi.patarchive.domain.PatArchiveVO;
import com.ruoyi.patarchive.mapper.PatArchivecontactMapper;
import com.ruoyi.patarchive.domain.PatArchivetagAndPatientInfo;
import com.ruoyi.patarchive.mapper.PatArchivetagMapper;
import com.ruoyi.patarchive.service.impl.PatArchivetagServiceImpl;
import com.ruoyi.patarchive.domain.PatUpInfoVO;
/**
 * æ‚£è€…档案Service业务层处理
 *
@@ -72,7 +77,7 @@
    private PatArchivetagMapper patArchivetagMapper;

    @Autowired
    private IPatMedInhospService patMedInhospService;
    private InhospVisitFacade inhospVisitFacade;

    @Autowired
    private PatArchivecontactMapper patArchivecontactMapper;
@@ -730,7 +735,7 @@
        //通过患者获取门诊信息
        PatMedInhosp patMedInhosp = new PatMedInhosp();
        patMedInhosp.setInhospno(pid);
        List<PatMedInhosp> patMedInhosps = patMedInhospService.selectPatMedInhospList(patMedInhosp);
        List<PatMedInhosp> patMedInhosps = inhospVisitFacade.selectPatMedInhospList(patMedInhosp);
        objectList.addAll(patMedInhosps);