|
@@ -8,10 +8,12 @@ import com.diagbot.enums.StatusEnum;
|
|
|
import com.diagbot.service.impl.DiseaseDeptServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
+import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.DiseaseDeptVO;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @Description:
|
|
@@ -34,6 +36,12 @@ public class DiseaseDeptFacade extends DiseaseDeptServiceImpl {
|
|
|
.eq("hospital_code", diseaseDeptVO.getHospitalCode())
|
|
|
.in(ListUtil.isNotEmpty(diseaseDeptVO.getConceptNames()), "concept_dis_name", diseaseDeptVO.getConceptNames());
|
|
|
List<DiseaseDept> diseaseDeptList = this.list(queryWrapper);
|
|
|
+ //过滤科室为空的数据和诊断分类为空的数据
|
|
|
+ diseaseDeptList = diseaseDeptList
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getDeptName()))
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getDiseaseName()))
|
|
|
+ .collect(Collectors.toList());
|
|
|
List<DiseaseDeptDTO> diseaseDeptDTOList = BeanUtil.listCopyTo(diseaseDeptList, DiseaseDeptDTO.class);
|
|
|
return diseaseDeptDTOList;
|
|
|
}
|