代码整理

icss-service/src/main/java/com/diagbot/facade/ModuleFacade.java

@@ -81,11 +81,11 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
             list = getModuleInfoByDisType(0, 0L);
             isPacs = true;
         }
-        if(isPacs){
+        if (isPacs) {
             for (ModuleInfo moduleInfo : list) {
-                if (Integer.parseInt(moduleInfo.getType()) == QuestionTypeEnum.Pacs.getKey()){
+                if (Integer.parseInt(moduleInfo.getType()) == QuestionTypeEnum.Pacs.getKey()) {
                     pacModuleIds.add(moduleInfo.getId());
-                }else {
+                } else {
                     ids.add(moduleInfo.getId());
                 }
             }
@@ -101,11 +101,11 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
             paramMap.put("sexType", moduleVO.getSexType());
             paramMap.put("age", moduleVO.getAge());
             List<ModuleDetail> moduleDetailList = moduleDetailFacade.getDetailByModuleFac(paramMap);
-            if(ListUtil.isNotEmpty(pacModuleIds)){//获取类型是化验的标签id
+            if (ListUtil.isNotEmpty(pacModuleIds)) {//获取类型是化验的标签id
                 QueryWrapper<ModuleDetail> moduleDetailQueryWrapper = new QueryWrapper<>();
-                moduleDetailQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                        .in("module_id",pacModuleIds);
-               List<ModuleDetail> moduleDetails = moduleDetailFacade.list(moduleDetailQueryWrapper);
+                moduleDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("module_id", pacModuleIds);
+                List<ModuleDetail> moduleDetails = moduleDetailFacade.list(moduleDetailQueryWrapper);
                 for (ModuleDetail moduleDetail : moduleDetails) {
                     moduleDetailList.add(moduleDetail);
                 }
@@ -121,9 +121,9 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
             if (moduleDetailMap.get(bean.getId()) != null) {
                 moduleDetailDTOList = BeanUtil.listCopyTo(moduleDetailMap.get(bean.getId()), ModuleDetailDTO.class);
                 for (ModuleDetailDTO detailDTO : moduleDetailDTOList) {
-                    if(Integer.parseInt(bean.getType()) == 6){
+                    if (Integer.parseInt(bean.getType()) == 6) {
                         pacsConceptIds.add(detailDTO.getQuestionId());
-                    }else if (null != detailDTO.getQuestionId()) {
+                    } else if (null != detailDTO.getQuestionId()) {
                         QuestionVO questionVO = new QuestionVO();
                         questionVO.setId(detailDTO.getQuestionId());
                         questionVO.setSexType(moduleVO.getSexType());
@@ -133,27 +133,27 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
                     }
                     if (null != detailDTO.getRelationModule() &&
                             moduleInfoMap.get(detailDTO.getRelationModule()) != null) {
-                            detailDTO.setRelationModuleName(moduleInfoMap.get(detailDTO.getRelationModule()).getName());
+                        detailDTO.setRelationModuleName(moduleInfoMap.get(detailDTO.getRelationModule()).getName());
                     }
                 }
                 bean.setModuleDetailDTOList(moduleDetailDTOList);
             }
         }
-        RespDTO<Map<Long,String>> pacsRespDTO = null;
+        RespDTO<Map<Long, String>> pacsRespDTO = null;
         //辅检
-        if(ListUtil.isNotEmpty(pacsConceptIds)){
+        if (ListUtil.isNotEmpty(pacsConceptIds)) {
             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)) {//如果存在辅检相关信息添加数据返回
             //将辅检标签放入出参
             for (ModuleInfoDTO bean : data) {
                 if (Integer.parseInt(bean.getType()) == QuestionTypeEnum.Pacs.getKey() && pacsRespDTO.data != null) {
-                    for (ModuleDetailDTO detailDTO :  bean.getModuleDetailDTOList()) {
+                    for (ModuleDetailDTO detailDTO : bean.getModuleDetailDTOList()) {
                         detailDTO.setName(pacsRespDTO.data.get(detailDTO.getQuestionId()));
                     }
                 }

icss-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -90,7 +90,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("id", questionIdList);
         List<QuestionInfo> questionInfoList = this.list(questionInfoQueryWrapper);
-        Map<Long, QuestionInfo> map = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+        Map<Long, QuestionInfo> map = questionInfoList.stream()
+                .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
         return map;
     }
 
@@ -133,11 +134,13 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         List<Long> questionId = questionInfoList.stream().map(r -> r.getId()).collect(Collectors.toList());
 
         // 获取第一层明细项
-        Map<Long, List<QuestionDetail>> detailMap = getQuestionDetailWithMap(questionInfoList.stream().filter(r -> r.getTagType() == 1).map(r -> r.getId()).collect(Collectors.toList()));
+        Map<Long, List<QuestionDetail>> detailMap = getQuestionDetailWithMap(questionInfoList.stream()
+                .filter(r -> r.getTagType() == 1).map(r -> r.getId()).collect(Collectors.toList()));
 
         // 获取第二层mapping和明细项
         List<Long> ques2 = new ArrayList<>();
-        Map<Long, List<QuestionInfoWrapper>> mapping2 = getQuestionMappingWithMap(sexType, age, questionId, ques2);
+        Map<Long, List<QuestionInfoWrapper>> mapping2 =
+                getQuestionMappingWithMap(sexType, age, questionId, ques2);
         Map<Long, List<QuestionDetail>> detailMap2 = getQuestionDetailWithMap(ques2);
 
         // 获取第三层mapping和明细项
@@ -188,12 +191,14 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 String project = res.getName();
                 List<String> details = new ArrayList<>();
                 if (ListUtil.isNotEmpty(res.getQuestionMapping())) {
-                    details = res.getQuestionMapping().stream().map(row -> row.getName()).collect(Collectors.toList());
+                    details = res.getQuestionMapping().stream().map(row -> row.getName())
+                            .collect(Collectors.toList());
                 }
                 GetLisMappingVO getLisMappingVO = new GetLisMappingVO();
                 getLisMappingVO.setProject(project);
                 getLisMappingVO.setDetails(details);
-                RespDTO<Map<String, Map<String, String>>> lisRespDTO = aiptServiceClient.getLisMappingByQuestion(getLisMappingVO);
+                RespDTO<Map<String, Map<String, String>>> lisRespDTO =
+                        aiptServiceClient.getLisMappingByQuestion(getLisMappingVO);
                 if (RespDTOUtil.respIsOK(lisRespDTO)) {
                     Map<String, Map<String, String>> map = lisRespDTO.data;
                     if (map != null) {

icss-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -44,43 +44,43 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      */
     public List<QuestionUsualDTO> getQuestionUsual(QuestionUsualVO questionUsualVO) {
         ConceptUsualVO conceptUsualVO = new ConceptUsualVO();
-        BeanUtil.copyProperties(questionUsualVO,conceptUsualVO);
+        BeanUtil.copyProperties(questionUsualVO, conceptUsualVO);
         List<QuestionUsualDTO> questionUsualDTOList = new ArrayList<>();
         //从知识库获取常用标签
         RespDTO<List<ConceptBaseDTO>> conceptBaseDTORespDTO = aiptServiceClient.getConceptUsual(conceptUsualVO);
         //如果该科室没有常用，返回全科常用
-        if( conceptBaseDTORespDTO != null && ListUtil.isEmpty(conceptBaseDTORespDTO.data)){
+        if (conceptBaseDTORespDTO != null && ListUtil.isEmpty(conceptBaseDTORespDTO.data)) {
             conceptUsualVO.setDeptName("全科");
             conceptBaseDTORespDTO = aiptServiceClient.getConceptUsual(conceptUsualVO);
         }
-        RespDTOUtil.respNGDeal(conceptBaseDTORespDTO,"获取常用标签失败");
-        if( conceptBaseDTORespDTO.data != null
-                && ListUtil.isNotEmpty(conceptBaseDTORespDTO.data)){
+        RespDTOUtil.respNGDeal(conceptBaseDTORespDTO, "获取常用标签失败");
+        if (conceptBaseDTORespDTO.data != null
+                && ListUtil.isNotEmpty(conceptBaseDTORespDTO.data)) {
             //提取标签名称
             List<String> conceptName = conceptBaseDTORespDTO.data.stream()
                     .map(ConceptBaseDTO::getName)
                     .collect(Collectors.toList());
             //与question标签匹配
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                    .in("tag_name",conceptName)
-                    .eq("type",questionUsualVO.getType());
+            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("tag_name", conceptName)
+                    .eq("type", questionUsualVO.getType());
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<String,QuestionInfo> questionInfoMap
+            Map<String, QuestionInfo> questionInfoMap
                     = questionInfoList.stream()
-                    .collect(Collectors.toMap(QuestionInfo::getTagName,questionInfo -> questionInfo));
-            questionUsualDTOList = BeanUtil.listCopyTo(conceptBaseDTORespDTO.data,QuestionUsualDTO.class);
-            for (QuestionUsualDTO questionUsualDTO: questionUsualDTOList) {
-                if(null != questionInfoMap.get(questionUsualDTO.getName())){
+                    .collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
+            questionUsualDTOList = BeanUtil.listCopyTo(conceptBaseDTORespDTO.data, QuestionUsualDTO.class);
+            for (QuestionUsualDTO questionUsualDTO : questionUsualDTOList) {
+                if (null != questionInfoMap.get(questionUsualDTO.getName())) {
                     questionUsualDTO.setQuestionId(questionInfoMap.get(questionUsualDTO.getName()).getId());
                 }
             }
             //如何没有匹配到questionId就移除
             Iterator<QuestionUsualDTO> questionUsualDTOIterator = questionUsualDTOList.iterator();
-            while (questionUsualDTOIterator.hasNext()){
-                if(questionUsualDTOIterator.next().getQuestionId() == null
+            while (questionUsualDTOIterator.hasNext()) {
+                if (questionUsualDTOIterator.next().getQuestionId() == null
                         && questionUsualVO.getType().intValue() != QuestionTypeEnum.Pacs.getKey()
-                        && questionUsualVO.getType().intValue() != QuestionTypeEnum.Disease.getKey()){
+                        && questionUsualVO.getType().intValue() != QuestionTypeEnum.Disease.getKey()) {
                     questionUsualDTOIterator.remove();
                 }
             }

icss-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -76,14 +76,14 @@ public class RetrievalFacade {
                 retrievalDTO.setConceptId(conceptRetrievalDTO.getSelfId());
                 retrievalDTO.setName(conceptRetrievalDTO.getSelfName());
                 if (StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())) {//parent不为空时说明有子项，返回父级id
-                    if(null != questionInfoMap.get(conceptRetrievalDTO.getParentName())){//如果匹配到就添加questionId
+                    if (null != questionInfoMap.get(conceptRetrievalDTO.getParentName())) {//如果匹配到就添加questionId
                         retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getParentName()).getId());
                     }
                     retrievalDTO.setConceptId(conceptRetrievalDTO.getParentId());
                     retrievalDTO.setName(conceptRetrievalDTO.getParentName());
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getSelfName());
                 } else {//parent为空时说明没有子项返回本体id
-                    if(null != questionInfoMap.get(conceptRetrievalDTO.getSelfName())){//如果匹配到就添加questionId
+                    if (null != questionInfoMap.get(conceptRetrievalDTO.getSelfName())) {//如果匹配到就添加questionId
                         retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getId());
                     }
                 }
@@ -99,14 +99,14 @@ public class RetrievalFacade {
         }
         //如何没有匹配到questionId就移除
         Iterator<RetrievalDTO> retrievalDTOIterator = retrievalDTOS.iterator();
-        while (retrievalDTOIterator.hasNext()){
+        while (retrievalDTOIterator.hasNext()) {
             RetrievalDTO retrievalDTO = new RetrievalDTO();
             retrievalDTO = retrievalDTOIterator.next();
-                if(retrievalDTO.getQuestionId() == null
-                        && retrievalDTO.getType().intValue() != ConceptTypeEnum.Pacs.getKey()
-                        && retrievalDTO.getType().intValue() != ConceptTypeEnum.Disease.getKey()){
-                        retrievalDTOIterator.remove();
-                }
+            if (retrievalDTO.getQuestionId() == null
+                    && retrievalDTO.getType().intValue() != ConceptTypeEnum.Pacs.getKey()
+                    && retrievalDTO.getType().intValue() != ConceptTypeEnum.Disease.getKey()) {
+                retrievalDTOIterator.remove();
+            }
         }
         return retrievalDTOS;
     }
@@ -117,9 +117,9 @@ public class RetrievalFacade {
      * @param getStaticVO
      * @return
      */
-    public List<RetrievalDTO> getStaticKnowledge(GetStaticVO getStaticVO){
+    public List<RetrievalDTO> getStaticKnowledge(GetStaticVO getStaticVO) {
         GetStaticKnowledgeVO getStaticKnowledgeVO = new GetStaticKnowledgeVO();
-        BeanUtil.copyProperties(getStaticVO,getStaticKnowledgeVO);
+        BeanUtil.copyProperties(getStaticVO, getStaticKnowledgeVO);
         //标签类型
         List<Integer> typeList = new ArrayList<>();//规定标签类型，只取诊断，化验，辅检，药品类型
         typeList.add(ConceptTypeEnum.Disease.getKey());
@@ -129,11 +129,11 @@ public class RetrievalFacade {
         getStaticKnowledgeVO.setTypes(typeList);
         //调用aipt-service获取有静态知识的标签
         RespDTO<List<RetrievalDTO>> retrievalDTOList = aiptServiceClient.getStaticKnowledge(getStaticKnowledgeVO);
-        RespDTOUtil.respNGDeal(retrievalDTOList,"获取静态知识失败");
-        if(ListUtil.isNotEmpty(retrievalDTOList.data)){
+        RespDTOUtil.respNGDeal(retrievalDTOList, "获取静态知识失败");
+        if (ListUtil.isNotEmpty(retrievalDTOList.data)) {
             List<String> questionNames = new ArrayList<>();
             for (RetrievalDTO retrievalDTOInfo : retrievalDTOList.data) {
-                if(typeList.contains(retrievalDTOInfo.getType())){
+                if (typeList.contains(retrievalDTOInfo.getType())) {
                     questionNames.add(retrievalDTOInfo.getName());
                 }
             }
@@ -147,7 +147,7 @@ public class RetrievalFacade {
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
             Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
             for (RetrievalDTO retrievalDTOInfo : retrievalDTOList.data) {
-                if(null != questionInfoMap.get(retrievalDTOInfo.getName())){//设置questionId
+                if (null != questionInfoMap.get(retrievalDTOInfo.getName())) {//设置questionId
                     retrievalDTOInfo.setQuestionId(questionInfoMap.get(retrievalDTOInfo.getName()).getId());
                 }
             }

icss-service/src/main/java/com/diagbot/mapper/QuestionInfoMapper.java

@@ -19,7 +19,8 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
 
     /**
-     *  根据参数获取标签信息
+     * 根据参数获取标签信息
+     *
      * @param map 参数
      * @return
      */
@@ -27,7 +28,8 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
 
     /**
-     *  根据参数获取标签信息
+     * 根据参数获取标签信息
+     *
      * @param map 参数
      * @return
      */
@@ -35,14 +37,16 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
 
     /**
-     *  根据questionMapping获取标签信息
+     * 根据questionMapping获取标签信息
+     *
      * @param map 参数
      * @return
      */
     public List<QuestionInfoWrapper> getByQuestionMapping(Map map);
 
     /**
-     *  根据questionRelation获取标签信息
+     * 根据questionRelation获取标签信息
+     *
      * @param map 参数
      * @return
      */

icss-service/src/main/java/com/diagbot/mapper/QuestionUsualMapper.java

@@ -19,6 +19,7 @@ public interface QuestionUsualMapper extends BaseMapper<QuestionUsual> {
 
     /**
      * 根据科室code获取常用标签
+     *
      * @return
      */
     public List<QuestionUsualDTO> getQuestionUsualName(QuestionUsualVO questionUsualVO);

icss-service/src/main/java/com/diagbot/service/TemplateInfoService.java

@@ -26,8 +26,7 @@ public interface TemplateInfoService extends IService<TemplateInfo> {
 
     public boolean updateById(TemplateInfo templateInfo);
 
-	public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO );
-    
+    public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO);
 
 
 }

icss-service/src/main/java/com/diagbot/service/impl/QuestionUsualServiceImpl.java

@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2018-11-16
  */
 @Service
-public class QuestionUsualServiceImpl extends ServiceImpl<QuestionUsualMapper, QuestionUsual> implements QuestionUsualService {
+public class QuestionUsualServiceImpl extends ServiceImpl<QuestionUsualMapper, QuestionUsual>
+        implements QuestionUsualService {
 
     @Override
     public List<QuestionUsualDTO> getQuestionUsualName(QuestionUsualVO questionUsualVO) {

icss-service/src/main/java/com/diagbot/service/impl/TemplateInfoServiceImpl.java

@@ -35,10 +35,10 @@ public class TemplateInfoServiceImpl extends ServiceImpl<TemplateInfoMapper, Tem
         return baseMapper.findByDoctorIdTemplate(templateInfo);
     }
 
-	@Override
-	public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO) {
-		return baseMapper.getTemplatePages(templateInfoPageVO);
-	}
+    @Override
+    public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO) {
+        return baseMapper.getTemplatePages(templateInfoPageVO);
+    }
 
 
 }

icss-service/src/main/java/com/diagbot/web/ScaleController.java

@@ -50,7 +50,7 @@ public class ScaleController {
     }
 
 
-    @ApiOperation(value = "知识库标准化-获取量表内容[by:zhoutg]",notes = "")
+    @ApiOperation(value = "知识库标准化-获取量表内容[by:zhoutg]", notes = "")
     @PostMapping("/getContent")
     public RespDTO<List<ScaleContent>> getContent(@RequestBody PushVO pushVO) {
         List<ScaleContent> data = scaleContentFacade.getContent(pushVO);