|
|
@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.diagbot.client.BehospitalInfoHystrixClient;
|
|
|
import com.diagbot.dto.AnalyzeMessageDTO;
|
|
|
import com.diagbot.dto.MedQcresultDetailAllDTO;
|
|
|
+import com.diagbot.dto.QcHospitalInfoAllDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.dto.SthospitalInfoFindDTO;
|
|
|
import com.diagbot.dto.SthospitalInfoPageDTO;
|
|
|
import com.diagbot.dto.SthospitalInfoStatiDTO;
|
|
|
+import com.diagbot.entity.BasHospitalInfo;
|
|
|
import com.diagbot.entity.MedBehospitalInfo;
|
|
|
import com.diagbot.entity.StdBehospitalInfo;
|
|
|
import com.diagbot.entity.StdQcresultDetail;
|
|
|
@@ -19,6 +21,7 @@ import com.diagbot.service.StdBehospitalInfoService;
|
|
|
import com.diagbot.service.impl.StdBehospitalInfoServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.DateUtil;
|
|
|
+import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.vo.AnalyzeApiVO;
|
|
|
import com.diagbot.vo.MedQcresultDetailAllVO;
|
|
|
@@ -33,8 +36,10 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author wangfeng
|
|
|
@@ -53,6 +58,8 @@ public class StdBehospitalInfoFacade extends StdBehospitalInfoServiceImpl {
|
|
|
StdQcresultDetailFacade stdQcresultDetailFacade;
|
|
|
@Autowired
|
|
|
BehospitalInfoHystrixClient behospitalInfoHystrixClient;
|
|
|
+ @Autowired
|
|
|
+ BasHospitalInfoFacade qcHospitalInfoFacade;
|
|
|
|
|
|
public IPage<SthospitalInfoPageDTO> getSthospitalInfoPages(SthospitalInfoPageVO sthospitalInfoPageVO) {
|
|
|
if (null != sthospitalInfoPageVO && null != sthospitalInfoPageVO.getLeaveHosDateStart()) {
|
|
|
@@ -180,6 +187,9 @@ public class StdBehospitalInfoFacade extends StdBehospitalInfoServiceImpl {
|
|
|
stdBehospitalInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
List<StdBehospitalInfo> list = stdBehospitalInfoService.list(stdBehospitalInfoQuery);
|
|
|
List<String> messages = new ArrayList<>();
|
|
|
+ List<QcHospitalInfoAllDTO> hospitalInfoData = qcHospitalInfoFacade.getHospitalInfoAll();
|
|
|
+ Map<Long,String> hospitalMap = new HashMap<>();
|
|
|
+ hospitalMap = hospitalInfoData.stream().collect(Collectors.toMap(QcHospitalInfoAllDTO::getId, hospitalInfo -> hospitalInfo.getName()));
|
|
|
if (ListUtil.isNotEmpty(list)) {
|
|
|
for (StdBehospitalInfo data : list) {
|
|
|
AnalyzeApiVO analyzeApiVO = new AnalyzeApiVO();
|
|
|
@@ -187,7 +197,7 @@ public class StdBehospitalInfoFacade extends StdBehospitalInfoServiceImpl {
|
|
|
analyzeApiVO.setHospitalId(data.getHospitalId());
|
|
|
RespDTO<Map<String, Object>> mapRespDTO = behospitalInfoHystrixClient.analyzeApi(analyzeApiVO);
|
|
|
if(mapRespDTO.data == null){
|
|
|
- messages.add(mapRespDTO.msg+data.getBehospitalCode());
|
|
|
+ messages.add("医院:"+hospitalMap.get(data.getHospitalId())+" 病人住院序号:"+data.getBehospitalCode()+" 错误信息:"+mapRespDTO.msg);
|
|
|
}
|
|
|
}
|
|
|
}
|
wangfeng