|
@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.diagbot.dto.ModuleDetailDTO;
|
|
|
import com.diagbot.dto.ModuleInfoDTO;
|
|
|
import com.diagbot.dto.QuestionDTO;
|
|
|
-import com.diagbot.entity.ModuleDeptMapping;
|
|
|
import com.diagbot.entity.ModuleDetail;
|
|
|
-import com.diagbot.entity.ModuleDiseaseMapping;
|
|
|
import com.diagbot.entity.ModuleInfo;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.service.impl.ModuleInfoServiceImpl;
|
|
@@ -37,10 +35,6 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
|
|
|
ModuleDetailFacade moduleDetailFacade;
|
|
|
@Autowired
|
|
|
QuestionFacade questionFacade;
|
|
|
- @Autowired
|
|
|
- ModuleDeptMappingFacade moduleDeptMappingFacade;
|
|
|
- @Autowired
|
|
|
- ModuleDiseaseMappingFacade moduleDiseaseMappingFacade;
|
|
|
|
|
|
/**
|
|
|
* 返回所有的模型结构
|
|
@@ -52,37 +46,35 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
|
|
|
//取到所有模板信息
|
|
|
List<ModuleInfo> list = new ArrayList<>();
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
- if(moduleVO.getDiseaseType().intValue() == 1){
|
|
|
+ if(moduleVO.getMouduleType().intValue() == 1){
|
|
|
//根据科室筛选如果没有,返回通用模板
|
|
|
- List<ModuleDeptMapping> moduleDeptMappings = moduleDeptMappingFacade.getModuleIdByDept(moduleVO.getDeptId());
|
|
|
- if(ListUtil.isNotEmpty(moduleDeptMappings)){
|
|
|
- list = this.getModuleInfoByDisType(moduleVO.getDiseaseType());
|
|
|
- ids = moduleDeptMappings.stream()
|
|
|
- .map(moduleDeptMapping -> moduleDeptMapping.getModuleId())
|
|
|
+ List<ModuleInfo> moduleInfoByDept = getModuleInfoByDisType(moduleVO.getMouduleType(),moduleVO.getRelationId());
|
|
|
+ if(ListUtil.isNotEmpty(moduleInfoByDept)){
|
|
|
+ ids = moduleInfoByDept.stream()
|
|
|
+ .map(moduleInfo -> moduleInfo.getId())
|
|
|
.collect(Collectors.toList());
|
|
|
}else {
|
|
|
- list = this.getModuleInfoByDisType(2);
|
|
|
+ list = getModuleInfoByDisType(0,0L);
|
|
|
ids = list.stream()
|
|
|
.map(moduleInfo -> moduleInfo.getId())
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
- }else if(moduleVO.getDiseaseType().intValue() == 0){
|
|
|
+ }else if(moduleVO.getMouduleType().intValue() == 2){
|
|
|
//根据慢病筛选如果没有返回通用模板
|
|
|
- List<ModuleDiseaseMapping> moduleDiseaseMappings = moduleDiseaseMappingFacade.getModuleIdByDisease(moduleVO.getDiseaseId());
|
|
|
- if(ListUtil.isNotEmpty(moduleDiseaseMappings)){
|
|
|
- list = this.getModuleInfoByDisType(moduleVO.getDiseaseType());
|
|
|
- ids = moduleDiseaseMappings.stream()
|
|
|
- .map(moduleDeptMapping -> moduleDeptMapping.getModuleId())
|
|
|
+ List<ModuleInfo> moduleINfoByDis = getModuleInfoByDisType(moduleVO.getMouduleType(),moduleVO.getRelationId());
|
|
|
+ if(ListUtil.isNotEmpty(moduleINfoByDis)){
|
|
|
+ ids = moduleINfoByDis.stream()
|
|
|
+ .map(moduleDeptMapping -> moduleDeptMapping.getId())
|
|
|
.collect(Collectors.toList());
|
|
|
}else {
|
|
|
- list = this.getModuleInfoByDisType(2);
|
|
|
+ list = getModuleInfoByDisType(0,0L);
|
|
|
ids = list.stream()
|
|
|
.map(moduleInfo -> moduleInfo.getId())
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
}else {
|
|
|
//默认
|
|
|
- list = this.getModuleInfoByDisType(moduleVO.getDiseaseType());
|
|
|
+ list = this.getModuleInfoByDisType(moduleVO.getMouduleType(),moduleVO.getRelationId());
|
|
|
ids = list.stream()
|
|
|
.map(artist -> artist.getId())
|
|
|
.collect(Collectors.toList());
|
|
@@ -124,13 +116,14 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
|
|
|
/**
|
|
|
* 获取相应类型的模板信息
|
|
|
*
|
|
|
- * @param diseaseType
|
|
|
+ * @param moduleType
|
|
|
* @return
|
|
|
*/
|
|
|
- public List<ModuleInfo> getModuleInfoByDisType(Integer diseaseType){
|
|
|
+ public List<ModuleInfo> getModuleInfoByDisType(Integer moduleType,Long relationId){
|
|
|
QueryWrapper<ModuleInfo> queryWrapper = new QueryWrapper();
|
|
|
queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
- .eq("disease_type", diseaseType);
|
|
|
+ .eq("module_type", moduleType)
|
|
|
+ .eq("relation_id", relationId);
|
|
|
queryWrapper.orderByAsc("id");
|
|
|
return this.list(queryWrapper);
|
|
|
}
|