|
@@ -15,6 +15,7 @@ import com.diagbot.util.BeanUtil;
|
|
import com.diagbot.util.EntityUtil;
|
|
import com.diagbot.util.EntityUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.RespDTOUtil;
|
|
import com.diagbot.util.RespDTOUtil;
|
|
|
|
+import com.diagbot.vo.ConceptFindVO;
|
|
import com.diagbot.vo.ConceptSearchVO;
|
|
import com.diagbot.vo.ConceptSearchVO;
|
|
import com.diagbot.vo.ModuleVO;
|
|
import com.diagbot.vo.ModuleVO;
|
|
import com.diagbot.vo.QuestionVO;
|
|
import com.diagbot.vo.QuestionVO;
|
|
@@ -49,29 +50,39 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
|
|
* @return 模型结构
|
|
* @return 模型结构
|
|
*/
|
|
*/
|
|
public List<ModuleInfoDTO> getAll(ModuleVO moduleVO) {
|
|
public List<ModuleInfoDTO> getAll(ModuleVO moduleVO) {
|
|
|
|
+ ConceptFindVO conceptFindVO = new ConceptFindVO();
|
|
ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
|
|
ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
|
|
List<ModuleInfoDTO> data = new ArrayList<>();
|
|
List<ModuleInfoDTO> data = new ArrayList<>();
|
|
//取到所有模板信息
|
|
//取到所有模板信息
|
|
List<ModuleInfo> list = new ArrayList<>();
|
|
List<ModuleInfo> list = new ArrayList<>();
|
|
List<Long> ids = new ArrayList<>();
|
|
List<Long> ids = new ArrayList<>();
|
|
List<Long> pacsConceptIds = new ArrayList<>();//辅检名称列表
|
|
List<Long> pacsConceptIds = new ArrayList<>();//辅检名称列表
|
|
|
|
+ List<Long> pacModuleIds = new ArrayList<>();//模板中辅检id
|
|
Boolean isDefault = false;
|
|
Boolean isDefault = false;
|
|
if (moduleVO.getMouduleType().intValue() == 1) {
|
|
if (moduleVO.getMouduleType().intValue() == 1) {
|
|
//根据科室筛选如果没有,返回通用模板
|
|
//根据科室筛选如果没有,返回通用模板
|
|
list = getModuleInfoByDisType(moduleVO.getMouduleType(), moduleVO.getRelationId());
|
|
list = getModuleInfoByDisType(moduleVO.getMouduleType(), moduleVO.getRelationId());
|
|
if (ListUtil.isNotEmpty(list)) {
|
|
if (ListUtil.isNotEmpty(list)) {
|
|
- ids = list.stream()
|
|
|
|
- .map(moduleInfo -> moduleInfo.getId())
|
|
|
|
- .collect(Collectors.toList());
|
|
|
|
|
|
+ for (ModuleInfo moduleInfo : list) {
|
|
|
|
+ if (Integer.parseInt(moduleInfo.getType()) == QuestionTypeEnum.Pacs.getKey()){
|
|
|
|
+ pacModuleIds.add(moduleInfo.getId());
|
|
|
|
+ }else {
|
|
|
|
+ ids.add(moduleInfo.getId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
isDefault = true;
|
|
isDefault = true;
|
|
}
|
|
}
|
|
} else if (moduleVO.getMouduleType().intValue() == 2) {
|
|
} else if (moduleVO.getMouduleType().intValue() == 2) {
|
|
//根据慢病筛选
|
|
//根据慢病筛选
|
|
list = getModuleInfoByDisType(moduleVO.getMouduleType(), moduleVO.getRelationId());
|
|
list = getModuleInfoByDisType(moduleVO.getMouduleType(), moduleVO.getRelationId());
|
|
- ids = list.stream()
|
|
|
|
- .map(moduleDeptMapping -> moduleDeptMapping.getId())
|
|
|
|
- .collect(Collectors.toList());
|
|
|
|
|
|
+ for (ModuleInfo moduleInfo : list) {
|
|
|
|
+ if (Integer.parseInt(moduleInfo.getType()) == QuestionTypeEnum.Pacs.getKey()){
|
|
|
|
+ pacModuleIds.add(moduleInfo.getId());
|
|
|
|
+ }else {
|
|
|
|
+ ids.add(moduleInfo.getId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
isDefault = true;
|
|
isDefault = true;
|
|
}
|
|
}
|
|
@@ -80,9 +91,13 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
|
|
if (isDefault) {
|
|
if (isDefault) {
|
|
//默认
|
|
//默认
|
|
list = getModuleInfoByDisType(0, 0L);
|
|
list = getModuleInfoByDisType(0, 0L);
|
|
- ids = list.stream()
|
|
|
|
- .map(moduleInfo -> moduleInfo.getId())
|
|
|
|
- .collect(Collectors.toList());
|
|
|
|
|
|
+ for (ModuleInfo moduleInfo : list) {
|
|
|
|
+ if (Integer.parseInt(moduleInfo.getType()) == QuestionTypeEnum.Pacs.getKey()){
|
|
|
|
+ pacModuleIds.add(moduleInfo.getId());
|
|
|
|
+ }else {
|
|
|
|
+ ids.add(moduleInfo.getId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
data = BeanUtil.listCopyTo(list, ModuleInfoDTO.class);
|
|
data = BeanUtil.listCopyTo(list, ModuleInfoDTO.class);
|
|
Map<Long, ModuleInfo> moduleInfoMap
|
|
Map<Long, ModuleInfo> moduleInfoMap
|
|
@@ -95,6 +110,15 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
|
|
paramMap.put("sexType", moduleVO.getSexType());
|
|
paramMap.put("sexType", moduleVO.getSexType());
|
|
paramMap.put("age", moduleVO.getAge());
|
|
paramMap.put("age", moduleVO.getAge());
|
|
List<ModuleDetail> moduleDetailList = moduleDetailFacade.getDetailByModuleFac(paramMap);
|
|
List<ModuleDetail> moduleDetailList = moduleDetailFacade.getDetailByModuleFac(paramMap);
|
|
|
|
+ if(ListUtil.isNotEmpty(pacModuleIds)){
|
|
|
|
+ QueryWrapper<ModuleDetail> moduleDetailQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ moduleDetailQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
|
|
|
|
+ .in("module_id",pacModuleIds);
|
|
|
|
+ List<ModuleDetail> moduleDetails = moduleDetailFacade.list(moduleDetailQueryWrapper);
|
|
|
|
+ for (ModuleDetail moduleDetail : moduleDetails) {
|
|
|
|
+ moduleDetailList.add(moduleDetail);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if (ListUtil.isNotEmpty(moduleDetailList)) {
|
|
if (ListUtil.isNotEmpty(moduleDetailList)) {
|
|
moduleDetailMap = EntityUtil.makeEntityListMap(moduleDetailList, "moduleId");
|
|
moduleDetailMap = EntityUtil.makeEntityListMap(moduleDetailList, "moduleId");
|
|
}
|
|
}
|
|
@@ -127,9 +151,11 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
|
|
RespDTO<Map<Long,String>> pacsRespDTO = null;
|
|
RespDTO<Map<Long,String>> pacsRespDTO = null;
|
|
//辅检
|
|
//辅检
|
|
if(ListUtil.isNotEmpty(pacsConceptIds)){
|
|
if(ListUtil.isNotEmpty(pacsConceptIds)){
|
|
- conceptSearchVO = new ConceptSearchVO();
|
|
|
|
- conceptSearchVO.setConceptIds(pacsConceptIds);
|
|
|
|
- pacsRespDTO = aiptServiceClient.getConceptMap(conceptSearchVO);
|
|
|
|
|
|
+ conceptFindVO = new ConceptFindVO();
|
|
|
|
+ conceptFindVO.setConceptIds(pacsConceptIds);
|
|
|
|
+ conceptFindVO.setAge(moduleVO.getAge());
|
|
|
|
+ conceptFindVO.setSexType(moduleVO.getSexType());
|
|
|
|
+ pacsRespDTO = aiptServiceClient.getConceptCondMap(conceptFindVO);
|
|
RespDTOUtil.respNGDeal(pacsRespDTO,"获取辅检标签失败");
|
|
RespDTOUtil.respNGDeal(pacsRespDTO,"获取辅检标签失败");
|
|
}
|
|
}
|
|
if(ListUtil.isNotEmpty(pacsConceptIds)){//如果存在辅检相关信息添加数据返回
|
|
if(ListUtil.isNotEmpty(pacsConceptIds)){//如果存在辅检相关信息添加数据返回
|