|
@@ -3,7 +3,6 @@ package com.diagbot.facade;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.diagbot.dto.HospitalInfoDTO;
|
|
|
import com.diagbot.dto.PlanDetailDTO;
|
|
|
import com.diagbot.dto.PlanInfoDefaultDTO;
|
|
|
import com.diagbot.dto.PlanInfoPagesDTO;
|
|
@@ -134,12 +133,14 @@ public class PlanFacade extends PlanServiceImpl {
|
|
|
IPage<PlanInfoPagesDTO> data = getPlanInfoPageAll(hospitalPlanPageVO);
|
|
|
List<PlanInfoPagesDTO> planInfos = data.getRecords();
|
|
|
List<Long> hospitaIds = new ArrayList<>();
|
|
|
- for(PlanInfoPagesDTO h:planInfos){
|
|
|
+ for (PlanInfoPagesDTO h : planInfos) {
|
|
|
hospitaIds.add(h.getHospitalId());
|
|
|
}
|
|
|
- Map<Long, String> hospitalInfo = hospitalInfoFacade.getHospitalInfoData(hospitaIds);
|
|
|
- for(PlanInfoPagesDTO planInfodata:planInfos){
|
|
|
- planInfodata.setHospitalName(hospitalInfo.get(planInfodata.getHospitalId()));
|
|
|
+ if (ListUtil.isNotEmpty(hospitaIds)) {
|
|
|
+ Map<Long, String> hospitalInfo = hospitalInfoFacade.getHospitalInfoData(hospitaIds);
|
|
|
+ for (PlanInfoPagesDTO planInfodata : planInfos) {
|
|
|
+ planInfodata.setHospitalName(hospitalInfo.get(planInfodata.getHospitalId()));
|
|
|
+ }
|
|
|
}
|
|
|
// 取版本id查明细
|
|
|
List<Long> ids = new ArrayList<>();
|
|
@@ -316,7 +317,7 @@ public class PlanFacade extends PlanServiceImpl {
|
|
|
|
|
|
}
|
|
|
Map<Long, String> hospitalInfo = hospitalInfoFacade.getHospitalInfoData(hospitaIds);
|
|
|
- if(ListUtil.isEmpty(planId)){
|
|
|
+ if (ListUtil.isEmpty(planId)) {
|
|
|
throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在!");
|
|
|
}
|
|
|
HospitalSetVO hospitalSetVO = new HospitalSetVO();
|