Merge remote-tracking branch 'origin/dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190918_vital

aipt-service/src/main/java/com/diagbot/facade/ClinicalFacade.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.diagbot.client.AIServiceClient;
 import com.diagbot.client.NLPServiceClient;
 import com.diagbot.client.bean.CalculateData;
-import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.Lexeme;
@@ -17,23 +16,13 @@ import com.diagbot.service.ScaleContentService;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.SearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -80,12 +69,12 @@ public class ClinicalFacade {
         //            addStandWord(resp.getData(), standWord, sData);
         //        }
 
-        sData.setLisArr(processLis(sData.getLisArr()));
+        // sData.setLisArr(processLis(sData.getLisArr()));
 
-        if (ListUtil.isNotEmpty(sData.getLisArr())) {
+        /*if (ListUtil.isNotEmpty(sData.getLisArr())) {
             List<String> otherVal = sData.getLisArr().stream().map(lisArr -> lisArr.getOtherValue()).collect(Collectors.toList());
             sData.setLis(String.join(",", otherVal));
-        }
+        }*/
 
         Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
         if (res == null || res.getData() == null) {

eureka-server/src/main/java/com/diagbot/listener/InstanceCancelListener.java

@@ -6,7 +6,6 @@ import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceCance
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Configuration;
 
-
 /**
  * @Description: 服务挂掉监听
  * @author: gaodm

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);

icssman-service/src/main/java/com/diagbot/facade/DictionaryFacade.java

@@ -27,7 +27,7 @@ public class DictionaryFacade extends DictionaryInfoServiceImpl {
      */
     public Map<Long, List<DictionaryInfo>> getList() {
         List<DictionaryInfo> list = this.list(new QueryWrapper<DictionaryInfo>()
-                .in("return_type", ListUtil.arrayToList(new Long[]{0L, 1L}))
+                .in("return_type", ListUtil.arrayToList(new Long[] { 0L, 1L }))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .orderByAsc("group_type", "order_no"));
         return EntityUtil.makeEntityListMap(list, "groupType");

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -73,6 +73,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     DictionaryFacade dictionaryFacade;
     @Autowired
     KnowledgemanServiceClient knowledgemanServiceClient;
+
     /**
      * 根据id删除标签模板
      *
@@ -82,22 +83,22 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     public Boolean deleteByIdsFac(String ids) {
         //如果是子模板，删除该子模板与其他模板的关联
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-        moduleInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                .eq("id",ids);
+        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", ids);
         ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
         String userId = UserUtils.getCurrentPrincipleID();
         Date date = DateUtil.now();
-        if(null != moduleInfo){
-            if("31".equals(moduleInfo.getType())
+        if (null != moduleInfo) {
+            if ("31".equals(moduleInfo.getType())
                     || "32".equals(moduleInfo.getType())
-                    || "322".equals(moduleInfo.getType())){
+                    || "322".equals(moduleInfo.getType())) {
                 UpdateWrapper<ModuleDetail> moduleDetailUpdateWrapper = new UpdateWrapper<>();
                 moduleDetailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("relation_module", moduleInfo.getId())
                         .set("is_deleted", IsDeleteEnum.Y.getKey())
                         .set("modifier", userId)
-                        .set("gmt_modified",date );
-                moduleDetailFacade.update(new ModuleDetail(),moduleDetailUpdateWrapper);
+                        .set("gmt_modified", date);
+                moduleDetailFacade.update(new ModuleDetail(), moduleDetailUpdateWrapper);
             }
         }
         if (StringUtil.isEmpty(ids)) {
@@ -135,7 +136,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         moduleInfo.setType(addModulInfoVO.getType());
         moduleInfo.setModuleType(addModulInfoVO.getModuleType());
         //当添加为科室专用模板或者慢病模板时添加关联id
-        if(addModulInfoVO.getModuleType().intValue() == 1 || addModulInfoVO.getModuleType().intValue() == 2){
+        if (addModulInfoVO.getModuleType().intValue() == 1 || addModulInfoVO.getModuleType().intValue() == 2) {
             moduleInfo.setRelationId(addModulInfoVO.getRelationId());
         }
         this.save(moduleInfo);
@@ -156,10 +157,10 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("id", updateModuleInfoVO.getId())
                 .set("name", updateModuleInfoVO.getName())
                 .set("type", updateModuleInfoVO.getType())
-                .set("module_type",updateModuleInfoVO.getModuleType())
+                .set("module_type", updateModuleInfoVO.getModuleType())
                 .set("modifier", userId)
                 .set("gmt_modified", DateUtil.now());
-        if(updateModuleInfoVO.getRelationId() != null){
+        if (updateModuleInfoVO.getRelationId() != null) {
             moduleInfoUpdateWrapper.set("relation_id", updateModuleInfoVO.getRelationId());
         }
         this.update(new ModuleInfo(), moduleInfoUpdateWrapper);
@@ -178,17 +179,18 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         List<GetQuestionInfoDTO> getQuestionInfoDTOS = new ArrayList<>();
         GetQuestionInfoDTO getQuestionInfoDTO = new GetQuestionInfoDTO();
         //如果是辅检，调用aipt-获取概念信息
-        if(moduleGetQuestionInfoVO.getType().intValue() == QuestionTypeEnum.Pacs.getKey()){
+        if (moduleGetQuestionInfoVO.getType().intValue() == QuestionTypeEnum.Pacs.getKey()) {
             getQuestionInfoDTOS = new ArrayList<>();
             GetConceptPacInfosVO getConceptPacInfosVO = new GetConceptPacInfosVO();
             getConceptPacInfosVO.setInputStr(moduleGetQuestionInfoVO.getTagName());
-            RespDTO<List<ConceptBaseDTO>> conceptBaseDTOS = knowledgemanServiceClient.getConceptPacInfos(getConceptPacInfosVO);
-            RespDTOUtil.respNGDeal(conceptBaseDTOS,"获取辅检标签失败");
-            if(ListUtil.isNotEmpty(moduleGetQuestionInfoVO.getNoIds())){
+            RespDTO<List<ConceptBaseDTO>> conceptBaseDTOS =
+                    knowledgemanServiceClient.getConceptPacInfos(getConceptPacInfosVO);
+            RespDTOUtil.respNGDeal(conceptBaseDTOS, "获取辅检标签失败");
+            if (ListUtil.isNotEmpty(moduleGetQuestionInfoVO.getNoIds())) {
                 Iterator<ConceptBaseDTO> conceptBaseDTOIterator = conceptBaseDTOS.data.iterator();
-                while (conceptBaseDTOIterator.hasNext()){
+                while (conceptBaseDTOIterator.hasNext()) {
                     for (Long notId : moduleGetQuestionInfoVO.getNoIds()) {
-                        if(conceptBaseDTOIterator.next().getConceptId().intValue() == notId.intValue()){
+                        if (conceptBaseDTOIterator.next().getConceptId().intValue() == notId.intValue()) {
                             conceptBaseDTOIterator.remove();
                         }
                     }
@@ -200,7 +202,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 getQuestionInfoDTO.setTagName(conceptBaseDTO.getName());
                 getQuestionInfoDTOS.add(getQuestionInfoDTO);
             }
-        }else {//返回除辅检以外的questionInfo信息
+        } else {//返回除辅检以外的questionInfo信息
             getQuestionInfoDTOS = new ArrayList<>();
             getQuestionInfoDTOS = questionFacade.moduleGetQuestiongInfoByName(moduleGetQuestionInfoVO);
         }
@@ -221,13 +223,13 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         if (getModuleInfoVO.getModuleType() != null) {
             moduleInfoQueryWrapper.eq("module_type", getModuleInfoVO.getModuleType());
         }
-        if(getModuleInfoVO.getType() != null) {
+        if (getModuleInfoVO.getType() != null) {
             moduleInfoQueryWrapper.eq("type", getModuleInfoVO.getType());
         }
-        if(ListUtil.isNotEmpty(getModuleInfoVO.getNoIds())){
+        if (ListUtil.isNotEmpty(getModuleInfoVO.getNoIds())) {
             moduleInfoQueryWrapper.notIn("id", getModuleInfoVO.getNoIds());
         }
-        if(getModuleInfoVO.getRelationId() != null) {
+        if (getModuleInfoVO.getRelationId() != null) {
             moduleInfoQueryWrapper.eq("relation_id", getModuleInfoVO.getRelationId());
         }
         List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
@@ -276,10 +278,10 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         List<Long> disId = new ArrayList<>();
         for (ModuleInfoListDTO moduleInfoListDTO : moduleInfoDTOIPage.getRecords()) {
             ids.add(moduleInfoListDTO.getModifier());
-            if(moduleInfoListDTO.getModuleType().intValue() == 1){
+            if (moduleInfoListDTO.getModuleType().intValue() == 1) {
                 deptId.add(moduleInfoListDTO.getRelationId());
             }
-            if(moduleInfoListDTO.getModuleType().intValue() == 2){
+            if (moduleInfoListDTO.getModuleType().intValue() == 2) {
                 disId.add(moduleInfoListDTO.getRelationId());
             }
         }
@@ -287,14 +289,16 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(1);
         RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
-        RespDTOUtil.respNGDeal(deptInfoList,"获取科室信息失败");
-        Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+        RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
+        Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream()
+                .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
         //获取疾病名称
         conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(3);
         RespDTO<List<ConceptBaseDTO>> disInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
-        RespDTOUtil.respNGDeal(disInfoList,"获取疾病信息失败");
-        Map<Long, ConceptBaseDTO> disInfoMap = disInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+        RespDTOUtil.respNGDeal(disInfoList, "获取疾病信息失败");
+        Map<Long, ConceptBaseDTO> disInfoMap = disInfoList.data.stream()
+                .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
         //获取模板类型名称
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
         dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -302,32 +306,35 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("return_type", 1)
                 .orderByDesc("order_no");
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
-        Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal,dictionaryInfo -> dictionaryInfo));
-        if(ListUtil.isNotEmpty(moduleInfoDTOIPage.getRecords())){
+        Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream()
+                .collect(Collectors.toMap(DictionaryInfo::getVal, dictionaryInfo -> dictionaryInfo));
+        if (ListUtil.isNotEmpty(moduleInfoDTOIPage.getRecords())) {
             //获取用户信息
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-            RespDTOUtil.respNGDeal(respDTO,"获取用户信息失败");
+            RespDTOUtil.respNGDeal(respDTO, "获取用户信息失败");
             //将用户信息放入实体
             for (ModuleInfoListDTO moduleInfoListDTO : moduleInfoDTOIPage.getRecords()) {
                 moduleInfoListDTO.setUserName(respDTO.data.get(moduleInfoListDTO.getModifier()));
-                if(dictionaryInfoMap.get(moduleInfoListDTO.getType()) != null ){
+                if (dictionaryInfoMap.get(moduleInfoListDTO.getType()) != null) {
                     moduleInfoListDTO.setAscriptionName(dictionaryInfoMap.get(moduleInfoListDTO.getType()).getName());
                 }
-                if(moduleInfoListDTO.getModuleType().intValue() == 1){//根据科室
-                    if(moduleInfoListDTO.getRelationId().intValue() != -1){//判断是不是科室通用子模板
-                        if(null != deptInfoMap.get(moduleInfoListDTO.getRelationId())){
-                            moduleInfoListDTO.setRelationName(deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                if (moduleInfoListDTO.getModuleType().intValue() == 1) {//根据科室
+                    if (moduleInfoListDTO.getRelationId().intValue() != -1) {//判断是不是科室通用子模板
+                        if (null != deptInfoMap.get(moduleInfoListDTO.getRelationId())) {
+                            moduleInfoListDTO.setRelationName(
+                                    deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
                         }
-                    }else {
+                    } else {
                         moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
                     }
                 }
-                if(moduleInfoListDTO.getModuleType().intValue() == 2){//根据疾病
-                    if(moduleInfoListDTO.getRelationId().intValue() != -1){//判断是不是疾病通用子模板
-                        if(null != disInfoMap.get(moduleInfoListDTO.getRelationId())){
-                            moduleInfoListDTO.setRelationName(disInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                if (moduleInfoListDTO.getModuleType().intValue() == 2) {//根据疾病
+                    if (moduleInfoListDTO.getRelationId().intValue() != -1) {//判断是不是疾病通用子模板
+                        if (null != disInfoMap.get(moduleInfoListDTO.getRelationId())) {
+                            moduleInfoListDTO.setRelationName(
+                                    disInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
                         }
-                    }else {
+                    } else {
                         moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
                     }
                 }
@@ -352,51 +359,60 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("module_id", getModuleDetailInfoVO.getModuleId())
                 .orderByAsc("order_no");
         List<ModuleDetail> moduleDetailList = moduleDetailFacade.list(moduleDetailQueryWrapper);
-        List<Long> questionIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getQuestionId()).collect(Collectors.toList());
-        List<Long> moduleIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getRelationModule()).collect(Collectors.toList());
+        List<Long> questionIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getQuestionId())
+                .collect(Collectors.toList());
+        List<Long> moduleIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getRelationModule())
+                .collect(Collectors.toList());
 
-        if(getModuleDetailInfoVO.getType().intValue() == QuestionTypeEnum.Pacs.getKey()){//如果是辅检，调用knowledgeman获取辅检信息
+        if (getModuleDetailInfoVO.getType().intValue() == QuestionTypeEnum.Pacs.getKey()) {
+            //如果是辅检，调用knowledgeman获取辅检信息
             ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
             conceptTypeVO.setType(2);
             RespDTO<List<ConceptBaseDTO>> pacsCeptInfo = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
-            Map<Long,ConceptBaseDTO> pacsCeptMap = pacsCeptInfo.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+            Map<Long, ConceptBaseDTO> pacsCeptMap = pacsCeptInfo.data.stream()
+                    .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
             //循环给出参赋值
             for (ModuleDetail moduleDetail : moduleDetailList) {
                 getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();
                 BeanUtil.copyProperties(moduleDetail, getModuleDetailInfoDTO);
-                if(pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()) != null){
+                if (pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()) != null) {
                     getModuleDetailInfoDTO.setTagName(pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()).getName());
                 }
-                if(pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()) != null) {//如果标准词库中没有该标签，则不显示
+                if (pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()) != null) {//如果标准词库中没有该标签，则不显示
                     getModuleDetailInfoDTOList.add(getModuleDetailInfoDTO);
                 }
             }
-        }else {
+        } else {
             //获取标签信息
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
             questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("id", questionIdList);
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+            Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream()
+                    .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
             //获取模板信息
             QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
             questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("id", moduleIdList);
             List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
-            Map<Long, ModuleInfo> moduleInfoMap = moduleInfoList.stream().collect(Collectors.toMap(ModuleInfo::getId, moduleInfo -> moduleInfo));
+            Map<Long, ModuleInfo> moduleInfoMap = moduleInfoList.stream()
+                    .collect(Collectors.toMap(ModuleInfo::getId, moduleInfo -> moduleInfo));
             //循环给出参赋值
             for (ModuleDetail moduleDetail : moduleDetailList) {
                 getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();
                 BeanUtil.copyProperties(moduleDetail, getModuleDetailInfoDTO);
                 if (moduleDetail.getQuestionId() != null) {
-                    if(questionInfoMap.get(moduleDetail.getQuestionId()) != null){
+                    if (questionInfoMap.get(moduleDetail.getQuestionId()) != null) {
                         getModuleDetailInfoDTO.setTagName(questionInfoMap.get(moduleDetail.getQuestionId()).getTagName());
                         getModuleDetailInfoDTO.setTagType(questionInfoMap.get(moduleDetail.getQuestionId()).getTagType());
                     }
                 } else {
-                    getModuleDetailInfoDTO.setRelationModuleName(moduleInfoMap.get(moduleDetail.getRelationModule()).getName());
+                    getModuleDetailInfoDTO.setRelationModuleName(
+                            moduleInfoMap.get(moduleDetail.getRelationModule()).getName());
                 }
-                if(questionInfoMap.get(moduleDetail.getQuestionId()) != null || moduleInfoMap.get(moduleDetail.getRelationModule()) != null){//如果标签表中已经删除这条数据，则不再显示该标签
+                if (questionInfoMap.get(moduleDetail.getQuestionId()) != null ||
+                        moduleInfoMap.get(moduleDetail.getRelationModule()) != null) {
+                    //如果标签表中已经删除这条数据，则不再显示该标签
                     getModuleDetailInfoDTOList.add(getModuleDetailInfoDTO);
                 }
             }
@@ -420,24 +436,26 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("id", getModuleInfoOneVO.getModuleId());
         ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
         //获取模板类型名称
-        if(moduleInfo.getModuleType().intValue() == 1){
+        if (moduleInfo.getModuleType().intValue() == 1) {
             deptId.add(moduleInfo.getRelationId());
         }
-        if(moduleInfo.getModuleType().intValue() == 2){
+        if (moduleInfo.getModuleType().intValue() == 2) {
             disId.add(moduleInfo.getRelationId());
         }
         //获取科室名称
         ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(1);
         RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
-        RespDTOUtil.respNGDeal(deptInfoList,"获取科室信息失败");
-        Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+        RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
+        Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream()
+                .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
         //获取疾病名称
         conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(3);
         RespDTO<List<ConceptBaseDTO>> disInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
-        RespDTOUtil.respNGDeal(disInfoList,"获取疾病信息失败");
-        Map<Long, ConceptBaseDTO> disInfoMap = disInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+        RespDTOUtil.respNGDeal(disInfoList, "获取疾病信息失败");
+        Map<Long, ConceptBaseDTO> disInfoMap = disInfoList.data.stream()
+                .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
         //获取模板类型
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
         dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -445,17 +463,18 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("return_type", 1)
                 .orderByDesc("order_no");
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
-        Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal,dictionaryInfo -> dictionaryInfo));
+        Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream()
+                .collect(Collectors.toMap(DictionaryInfo::getVal, dictionaryInfo -> dictionaryInfo));
         BeanUtil.copyProperties(moduleInfo, getModuleInfoOneDTO);
         getModuleInfoOneDTO.setAscriptionName(dictionaryInfoMap.get(String.valueOf(moduleInfo.getType())).getName());
         getModuleInfoOneDTO.setModuleTypeName(ModuleInfoTypeEnum.getName(getModuleInfoOneDTO.getModuleType().intValue()));
-        if(getModuleInfoOneDTO.getModuleType().intValue() == 1){
-            if(null != deptInfoMap.get(getModuleInfoOneDTO.getRelationId())){
+        if (getModuleInfoOneDTO.getModuleType().intValue() == 1) {
+            if (null != deptInfoMap.get(getModuleInfoOneDTO.getRelationId())) {
                 getModuleInfoOneDTO.setRelationName(deptInfoMap.get(getModuleInfoOneDTO.getRelationId()).getName());
             }
         }
-        if(getModuleInfoOneDTO.getModuleType().intValue() == 2){
-            if(null != disInfoMap.get(getModuleInfoOneDTO.getRelationId())){
+        if (getModuleInfoOneDTO.getModuleType().intValue() == 2) {
+            if (null != disInfoMap.get(getModuleInfoOneDTO.getRelationId())) {
                 getModuleInfoOneDTO.setRelationName(disInfoMap.get(getModuleInfoOneDTO.getRelationId()).getName());
             }
         }
@@ -468,11 +487,11 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      * @param getModuleTypeVO
      * @return
      */
-    public List<GetModuleTypeDTO> getModuleType(GetModuleTypeVO getModuleTypeVO){
+    public List<GetModuleTypeDTO> getModuleType(GetModuleTypeVO getModuleTypeVO) {
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("module_Type", getModuleTypeVO.getModuleType());
-        if(getModuleTypeVO.getRelationId() != null){
+        if (getModuleTypeVO.getRelationId() != null) {
             moduleInfoQueryWrapper.eq("relation_id", getModuleTypeVO.getRelationId());
         }
         List<ModuleInfo> moduleInfos = this.list(moduleInfoQueryWrapper);
@@ -482,20 +501,24 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("group_type", 4)
                 .eq("return_type", 1)
-                .notIn("val",types)
+                .notIn("val", types)
                 .orderByAsc("order_no");
-        if(getModuleTypeVO.getRelationId() != null && getModuleTypeVO.getRelationId().intValue() == -1){//如果是-1时返回所有子模板
-            dictionaryInfoQueryWrapper.in("val","322","31","32");
+        if (getModuleTypeVO.getRelationId() != null && getModuleTypeVO.getRelationId().intValue() == -1) {
+            //如果是-1时返回所有子模板
+            dictionaryInfoQueryWrapper.in("val", "322", "31", "32");
         }
-        if(getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 2){//为慢病时过滤现病史空模板、主诉模板、现病史空模板子模板
-            dictionaryInfoQueryWrapper.notIn("val","1","22","31","322");
+        if (getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 2) {
+            //为慢病时过滤现病史空模板、主诉模板、现病史空模板子模板
+            dictionaryInfoQueryWrapper.notIn("val", "1", "22", "31", "322");
         }
-        if(getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 0 || getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 1){//为通用或科室时过滤化验附件诊断
-            dictionaryInfoQueryWrapper.notIn("val","4","5","6","7");
+        if (getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 0 ||
+                getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 1) {
+            //为通用或科室时过滤化验附件诊断
+            dictionaryInfoQueryWrapper.notIn("val", "4", "5", "6", "7");
         }
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
         List<GetModuleTypeDTO> getModuleTypeDTOS = new ArrayList<>();
-        for (DictionaryInfo dictionaryInfo: dictionaryInfoList) {
+        for (DictionaryInfo dictionaryInfo : dictionaryInfoList) {
             GetModuleTypeDTO getModuleTypeDTO = new GetModuleTypeDTO();
             getModuleTypeDTO.setName(dictionaryInfo.getName());
             getModuleTypeDTO.setType(dictionaryInfo.getVal());
@@ -509,45 +532,49 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      *
      * @return
      */
-    public GetAllDeptAndDisInfoDTO getAllDeptAndDisInfo(GetAllDeptAndDisInfoVO getAllDeptAndDisInfoVO){
+    public GetAllDeptAndDisInfoDTO getAllDeptAndDisInfo(GetAllDeptAndDisInfoVO getAllDeptAndDisInfoVO) {
         //获取所有科室
         ConceptTypeVO deptType = new ConceptTypeVO();
         deptType.setType(1);
         RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(deptType);
-        RespDTOUtil.respNGDeal(deptInfoList,"获取科室信息失败");
-        if(getAllDeptAndDisInfoVO.getModuleType() != null && getAllDeptAndDisInfoVO.getModuleType().intValue() == 1){//过滤添加过得科室
-            List<ModuleInfo> moduleInfoList = getModuleInfos(getAllDeptAndDisInfoVO.getModuleType(),getAllDeptAndDisInfoVO.getType());
+        RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
+        if (getAllDeptAndDisInfoVO.getModuleType() != null && getAllDeptAndDisInfoVO.getModuleType().intValue() == 1) {
+            //过滤添加过得科室
+            List<ModuleInfo> moduleInfoList = getModuleInfos(getAllDeptAndDisInfoVO.getModuleType(),
+                    getAllDeptAndDisInfoVO.getType());
             List<Long> deptIds = moduleInfoList.stream().map(ModuleInfo::getRelationId).collect(Collectors.toList());
             Iterator<ConceptBaseDTO> deptIterator = deptInfoList.data.iterator();
             for (Long deptId : deptIds) {
-                while (deptIterator.hasNext()){
+                while (deptIterator.hasNext()) {
                     Long deptConceptId = deptIterator.next().getConceptId();
-                    if(deptId.intValue() == deptConceptId.intValue()){
+                    if (deptId.intValue() == deptConceptId.intValue()) {
                         deptIterator.remove();
                     }
                 }
             }
         }
-        List<DeptDTO> deptDTOS = BeanUtil.listCopyTo(deptInfoList.data,DeptDTO.class);
+        List<DeptDTO> deptDTOS = BeanUtil.listCopyTo(deptInfoList.data, DeptDTO.class);
         //获取所有疾病
         ConceptTypeVO disType = new ConceptTypeVO();
         disType.setType(3);
         RespDTO<List<ConceptBaseDTO>> disTypes = knowledgemanServiceClient.getConceptListByType(disType);
-        RespDTOUtil.respNGDeal(disTypes,"获取疾病信息失败");
-        if(getAllDeptAndDisInfoVO.getModuleType() != null && getAllDeptAndDisInfoVO.getModuleType().intValue() == 2){//过滤添加过得疾病
-            List<ModuleInfo> moduleInfoList = getModuleInfos(getAllDeptAndDisInfoVO.getModuleType(),getAllDeptAndDisInfoVO.getType());
+        RespDTOUtil.respNGDeal(disTypes, "获取疾病信息失败");
+        if (getAllDeptAndDisInfoVO.getModuleType() != null
+                && getAllDeptAndDisInfoVO.getModuleType().intValue() == 2) {//过滤添加过得疾病
+            List<ModuleInfo> moduleInfoList = getModuleInfos(getAllDeptAndDisInfoVO.getModuleType(),
+                    getAllDeptAndDisInfoVO.getType());
             List<Long> disIds = moduleInfoList.stream().map(ModuleInfo::getRelationId).collect(Collectors.toList());
             Iterator<ConceptBaseDTO> disIterator = disTypes.data.iterator();
             for (Long disId : disIds) {
-                while (disIterator.hasNext()){
+                while (disIterator.hasNext()) {
                     Long disConceptId = disIterator.next().getConceptId();
-                    if(disId.intValue() == disConceptId.intValue()){
+                    if (disId.intValue() == disConceptId.intValue()) {
                         disIterator.remove();
                     }
                 }
             }
         }
-        List<DisDTO> disDTOS = BeanUtil.listCopyTo(disTypes.data,DisDTO.class);
+        List<DisDTO> disDTOS = BeanUtil.listCopyTo(disTypes.data, DisDTO.class);
         GetAllDeptAndDisInfoDTO getAllDeptAndDisInfoDTO = new GetAllDeptAndDisInfoDTO();
         getAllDeptAndDisInfoDTO.setDeptDTOS(deptDTOS);
         getAllDeptAndDisInfoDTO.setDisDTOS(disDTOS);
@@ -561,11 +588,11 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      * @param type
      * @return
      */
-    public List<ModuleInfo> getModuleInfos(Long moduleType,String type){
+    public List<ModuleInfo> getModuleInfos(Long moduleType, String type) {
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-        moduleInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                .eq("module_type",moduleType)
-                .eq("type",type);
+        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("module_type", moduleType)
+                .eq("type", type);
         return this.list(moduleInfoQueryWrapper);
     }
 
@@ -575,7 +602,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      * @param getQuestiongAndModuleRelationsVO
      * @return
      */
-    public GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelations(GetQuestiongAndModuleRelationsVO getQuestiongAndModuleRelationsVO){
+    public GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelations(
+            GetQuestiongAndModuleRelationsVO getQuestiongAndModuleRelationsVO) {
         StringBuffer errMsg = new StringBuffer();
         List<ModuleDetail> moduleDetails = moduleDetailFacade.list(new QueryWrapper<ModuleDetail>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -585,8 +613,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             List<String> moduleNames = this.list(new QueryWrapper<ModuleInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("id", moduleIds))
-                    .stream().map(row ->  row.getName()).collect(Collectors.toList());
-            for (String mouduleName: moduleNames) {
+                    .stream().map(row -> row.getName()).collect(Collectors.toList());
+            for (String mouduleName : moduleNames) {
                 errMsg.append("请先删除关联模板：").append("【" + mouduleName + "】").append("<br/>");
             }
         }

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

@@ -204,7 +204,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                                 .eq("id", ques.getId()), false);
                         if (ques == null) {
-                            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签被修改，请刷新后重新保存");
+                            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                                    "标签被修改，请刷新后重新保存");
                         }
                     } else {
                         String name = "组合项_" + DateUtil.format(now, DateUtil.FORMAT_FULL);
@@ -266,7 +267,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      * @param now
      * @param id
      */
-    public void saveMapping(List<QuestionMappingWrapper> questionMappings, Map<String, Long> map, String person, Date now, Long id) {
+    public void saveMapping(List<QuestionMappingWrapper> questionMappings, Map<String, Long> map, String person,
+                            Date now, Long id) {
         List<QuestionMapping> saveMapping = new ArrayList<>();
         int i = 1;
         for (QuestionMappingWrapper mapping : questionMappings) {
@@ -298,15 +300,18 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      * @param type
      * @return
      */
-    public Map<String, Long> getNameMap(List<QuestionMappingWrapper> questionMappings, Date now, String person, Integer type) {
-        List<String> nameList = questionMappings.stream().filter(row -> StringUtil.isNotEmpty(row.getText())).map(row -> row.getText()).collect(Collectors.toList());
+    public Map<String, Long> getNameMap(List<QuestionMappingWrapper> questionMappings, Date now,
+                                        String person, Integer type) {
+        List<String> nameList = questionMappings.stream().filter(row -> StringUtil.isNotEmpty(row.getText()))
+                .map(row -> row.getText()).collect(Collectors.toList());
         List<QuestionInfo> questionInfos = this.list(new QueryWrapper<QuestionInfo>()
                 .eq("type", type)
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("tag_type", TagTypeEnum.T8.getKey())
                 .in("name", nameList)
         );
-        Map<String, Long> map = questionInfos.stream().collect(Collectors.toMap(row -> row.getName(), row -> row.getId(), (k1, k2) -> k1));
+        Map<String, Long> map = questionInfos.stream()
+                .collect(Collectors.toMap(row -> row.getName(), row -> row.getId(), (k1, k2) -> k1));
         List<QuestionInfo> addBatch = new ArrayList<>();
         List<String> nameExist = new ArrayList<>();
         for (String s : nameList) {
@@ -436,7 +441,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         List<String> nameList = new ArrayList<>();
         ConceptExistVO conceptExistVO = new ConceptExistVO();
         for (QuestionPageDTO bean : res.getRecords()) {
-            if (QuestionTypeEnum.Lis.getKey() == bean.getType() && TagTypeEnum.T7.getKey() != bean.getTagType().intValue()) {
+            if (QuestionTypeEnum.Lis.getKey() == bean.getType()
+                    && TagTypeEnum.T7.getKey() != bean.getTagType().intValue()) {
                 nameList.add(bean.getName());
             } else {
                 nameList.add(bean.getTagName());
@@ -450,7 +456,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             for (QuestionPageDTO bean : res.getRecords()) {
                 List<Integer> list = new ArrayList<>();
                 Boolean isLisDetail = false;
-                if (QuestionTypeEnum.Lis.getKey() == bean.getType() && TagTypeEnum.T7.getKey() != bean.getTagType().intValue()) {
+                if (QuestionTypeEnum.Lis.getKey() == bean.getType()
+                        && TagTypeEnum.T7.getKey() != bean.getTagType().intValue()) {
                     isLisDetail = true;
                 }
                 if (isLisDetail) {
@@ -460,7 +467,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 }
                 // 化验明细需要特殊处理，类型转换为明细
                 if (ListUtil.isNotEmpty(list)) {
-                    if (list.contains(bean.getType()) || (isLisDetail && list.contains(QuestionTypeEnum.LisDetail.getKey()))) {
+                    if (list.contains(bean.getType()) ||
+                            (isLisDetail && list.contains(QuestionTypeEnum.LisDetail.getKey()))) {
                         bean.setExist(true);
                     }
                 }
@@ -523,8 +531,10 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             //模板关联
             GetQuestiongAndModuleRelationsVO getQuestiongAndModuleRelationsVO = new GetQuestiongAndModuleRelationsVO();
             getQuestiongAndModuleRelationsVO.setQuestionId(Long.parseLong(id));
-            GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelationsDTO = moduleInfoFacade.getQuestiongAndModuleRelations(getQuestiongAndModuleRelationsVO);
-            if (null != getQuestiongAndModuleRelationsDTO && StringUtil.isNotBlank(getQuestiongAndModuleRelationsDTO.getRelationInfos().toString())) {
+            GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelationsDTO =
+                    moduleInfoFacade.getQuestiongAndModuleRelations(getQuestiongAndModuleRelationsVO);
+            if (null != getQuestiongAndModuleRelationsDTO &&
+                    StringUtil.isNotBlank(getQuestiongAndModuleRelationsDTO.getRelationInfos().toString())) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         getQuestiongAndModuleRelationsDTO.getRelationInfos().toString());
             }
@@ -535,7 +545,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             List<DeptVital> deptVitals = deptVitalFacade.list(deptVitalQueryWrapper);
             if (ListUtil.isNotEmpty(deptVitals)) {
                 //科室信息
-                List<Long> deptIds = deptVitals.stream().map(deptVitalDTO -> deptVitalDTO.getDeptId()).collect(Collectors.toList());
+                List<Long> deptIds = deptVitals.stream().map(deptVitalDTO -> deptVitalDTO.getDeptId())
+                        .collect(Collectors.toList());
                 ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
                 conceptSearchVO.setConceptIds(deptIds);
                 RespDTO<Map<Long, String>> deptMap = klmServiceClient.getConceptMap(conceptSearchVO);
@@ -544,7 +555,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 StringBuffer sb = new StringBuffer();
                 sb.append("请先删除科室查体模板关联中的对应标签：");
                 for (DeptVital deptVital : deptVitals) {
-                    if(StringUtil.isNotBlank(depts.get(deptVital.getDeptId()))){
+                    if (StringUtil.isNotBlank(depts.get(deptVital.getDeptId()))) {
                         sb.append("【" + depts.get(deptVital.getDeptId()) + "】").append("<br/>");
                     }
                 }
@@ -633,10 +644,12 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("notControlType", questionIndexSubVO.getNotControlType());
 
         QueryWrapper<QuestionMapping> questionMappingQueryWrapper = new QueryWrapper<>();
-        questionMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("parent_question", questionIndexSubVO.getParentId());
+        questionMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("parent_question", questionIndexSubVO.getParentId());
         List<QuestionMapping> questionMappingList = questionMappingFacade.list(questionMappingQueryWrapper);
         if (ListUtil.isNotEmpty(questionMappingList)) {
-            List<Long> sonIds = questionMappingList.stream().map(questionMapping -> questionMapping.getSonQuestion()).collect(Collectors.toList());
+            List<Long> sonIds = questionMappingList.stream().map(questionMapping -> questionMapping.getSonQuestion())
+                    .collect(Collectors.toList());
             paramMap.put("ids", sonIds);
         }
         List<QuestionInfo> res = this.index(paramMap);
@@ -676,7 +689,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("type", getQuestionIdsByTypeVO.getQuestionType());
         List<QuestionInfo> questionInfoList = this.list(queryWrapper);
-        List<Long> questionIds = questionInfoList.stream().map(questionInfo -> questionInfo.getId()).collect(Collectors.toList());
+        List<Long> questionIds = questionInfoList.stream().map(questionInfo -> questionInfo.getId())
+                .collect(Collectors.toList());
         return questionIds;
     }
 
@@ -718,7 +732,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             paramMap1.put("ids", sonQuestionIds);
             //获取第二级子标签
             List<QuestionInfoWrapper> questionMapping1 = this.getByQuestionMapping(paramMap1);
-            Map<Long, List<QuestionInfoWrapper>> qm1 = EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
+            Map<Long, List<QuestionInfoWrapper>> qm1 =
+                    EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
             for (QuestionDTO bean : sonQuestionList) {
                 List<QuestionDetail> questionDetailList1 = sonQuestionMap.get(bean.getId());
                 if (ListUtil.isEmpty(questionDetailList1)) {

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

@@ -25,7 +25,8 @@ import java.util.Map;
 public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
     /**
-     *  根据参数获取标签信息
+     * 根据参数获取标签信息
+     *
      * @param map 参数
      * @return
      */
@@ -43,7 +44,7 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
      * @param getQuestionInfoVO
      * @return
      */
-    public List<GetQuestionInfoDTO> getQuestiongInfoByName(GetQuestionInfoVO  getQuestionInfoVO);
+    public List<GetQuestionInfoDTO> getQuestiongInfoByName(GetQuestionInfoVO getQuestionInfoVO);
 
     /**
      * 根据名称获取标签信息
@@ -55,6 +56,7 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
     /**
      * 根据科室id获取标签信息
+     *
      * @param getQuestionUsualByDeptVO
      * @return
      */
@@ -63,6 +65,7 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
     /**
      * 获取特殊标签，同伴|无
+     *
      * @param map
      * @return
      */
@@ -87,9 +90,9 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
     public IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO);
 
 
-
     /**
-     *  根据questionMapping获取标签信息
+     * 根据questionMapping获取标签信息
+     *
      * @param map 参数
      * @return
      */

icssman-service/src/main/java/com/diagbot/vo/GetQuestionInfoVO.java

@@ -22,7 +22,7 @@ public class GetQuestionInfoVO {
     /**
      * 科室id
      */
-    @NotNull(message="科室id不能为空")
+    @NotNull(message = "科室id不能为空")
     private String deptId;
 
     /**
@@ -33,6 +33,6 @@ public class GetQuestionInfoVO {
     /**
      * 归属类型
      */
-    @NotNull(message="归属类型不能为空")
+    @NotNull(message = "归属类型不能为空")
     private Integer type;
 }

icssman-service/src/main/java/com/diagbot/web/DeptVitalController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DeptShortDTO;

icssman-service/src/main/java/com/diagbot/web/DictionaryInfoController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DictionaryInfo;

icssman-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetAllDeptAndDisInfoDTO;

icssman-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ConceptBaseDTO;
@@ -163,7 +162,7 @@ public class QuestionInfoController {
                     "type： 标签归属，必填<br>")
     @PostMapping("/indexByLexicon")
     @SysLogger("indexByLexicon")
-    public RespDTO<List<ConceptBaseDTO>> indexByLexicon(@RequestBody IndexIcssVO indexIcssVO){
+    public RespDTO<List<ConceptBaseDTO>> indexByLexicon(@RequestBody IndexIcssVO indexIcssVO) {
         return RespDTO.onSuc(questionFacade.indexByLexiconFac(indexIcssVO));
     }
 }

knowledgeman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -157,7 +157,10 @@ public class RelationContactFacade extends RelationServiceImpl {
 		relationQe.eq("start_id", conceptId);
 		if(relationNodeVO!=null&&relationNodeVO.getSonRelationId()!=null){
 			relationQe.eq("relation_id", relationNodeVO.getSonRelationId());
+		}else{
+			relationQe.eq("relation_id", -999999l);
 		}
+		
 		List<Relation> relationList = list(relationQe);
 		
 		if(ListUtil.isNotEmpty(relationList)){

knowledgeman-service/src/main/java/com/diagbot/web/DiagnoseExportImportController.java

@@ -1,10 +1,13 @@
 package com.diagbot.web;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.diagbot.annotation.SysLoggerExport;
+import com.diagbot.facade.DiagnoseImportFacade;
+import com.diagbot.util.GsonUtil;
+import com.diagbot.vo.DiagnosticAllExportVO;
+import com.diagbot.vo.DiagnosticBasisExportVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,19 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-import com.diagbot.annotation.SysLoggerExport;
-import com.diagbot.facade.DiagnoseImportFacade;
-import com.diagbot.util.GsonUtil;
-import com.diagbot.vo.DiagnosticAllExportVO;
-import com.diagbot.vo.DiagnosticBasisExportVO;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年8月8日 下午1:26:22
@@ -35,33 +31,32 @@ import springfox.documentation.annotations.ApiIgnore;
 @SuppressWarnings("unchecked")
 public class DiagnoseExportImportController {
 
-	@Autowired
-	DiagnoseImportFacade diagnoseImportFacade;
+    @Autowired
+    DiagnoseImportFacade diagnoseImportFacade;
 
     @ApiOperation(value = "导入诊断依据数据:[by:wangfeng]", notes = "导入诊断依据数据")
-    @PostMapping(value = "/importDiagnosticBasis", produces="text/html;charset=utf-8")
+    @PostMapping(value = "/importDiagnosticBasis", produces = "text/html;charset=utf-8")
     @ApiIgnore
-    public String importDiagnosticBasis(@RequestParam("uploadfile") MultipartFile file,HttpServletRequest request) {
+    public String importDiagnosticBasis(@RequestParam("uploadfile") MultipartFile file,
+                                        HttpServletRequest request) {
         return GsonUtil.toJson(diagnoseImportFacade.importDiagnosticBasisAll(file, request));
     }
-    
+
     @ApiOperation(value = "导出诊断依据问题:[by:wangfeng]", notes = "导出诊断依据问题")
     @PostMapping("/exportDiagnosticBasis")
     @SysLoggerExport("exportDiagnosticBasis")
     @ResponseBody
-    public  void exportDiagnosticBasis(@RequestBody DiagnosticBasisExportVO diaExportVO,HttpServletRequest request,HttpServletResponse response)
-            throws Exception {
-    	diagnoseImportFacade.exportDiagnosticBasis(diaExportVO, response);
-        
+    public void exportDiagnosticBasis(@RequestBody DiagnosticBasisExportVO diaExportVO,
+                                      HttpServletRequest request, HttpServletResponse response) throws Exception {
+        diagnoseImportFacade.exportDiagnosticBasis(diaExportVO, response);
     }
-    
+
     @ApiOperation(value = "导出诊断依据:[by:wangfeng]", notes = "导出诊断依据")
     @PostMapping("/exportDiagnosticAll")
     @SysLoggerExport("exportDiagnosticAll")
     @ResponseBody
-    public  void exportDiagnosticAll(@RequestBody DiagnosticAllExportVO diaAllExportVO,HttpServletRequest request,HttpServletResponse response)
-            throws Exception {
-    	diagnoseImportFacade.exportDiagnosticAll(diaAllExportVO, response);
-        
+    public void exportDiagnosticAll(@RequestBody DiagnosticAllExportVO diaAllExportVO,
+                                    HttpServletRequest request, HttpServletResponse response) throws Exception {
+        diagnoseImportFacade.exportDiagnosticAll(diaAllExportVO, response);
     }
 }

log-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

@@ -73,7 +73,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             paramMap1.put("ids", sonQuestionIds);
             //获取第二级子标签
             List<QuestionInfoWrapper> questionMapping1 = this.getByQuestionMapping(paramMap1);
-            Map<Long, List<QuestionInfoWrapper>> qm1 = EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
+            Map<Long, List<QuestionInfoWrapper>> qm1 =
+                    EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
             for (QuestionDTO bean : sonQuestionList) {
                 List<QuestionDetail> questionDetailList1 = sonQuestionMap.get(bean.getId());
                 if (ListUtil.isEmpty(questionDetailList1)) {
@@ -128,7 +129,8 @@ 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<>();
@@ -193,7 +195,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("question_id", questionIds)
                 .orderByAsc("order_no"));
-        Map<Long, List<QuestionDetail>> detailMap = EntityUtil.makeEntityListMap(detailList, "questionId");
+        Map<Long, List<QuestionDetail>> detailMap =
+                EntityUtil.makeEntityListMap(detailList, "questionId");
         return detailMap;
     }
 

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

@@ -62,7 +62,8 @@ public class RetrievalFacade {
                     .ne("tag_type", 8)
                     .eq("item_type", 0);
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
+            Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream()
+                    .collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
             RetrievalDTO retrievalDTO = new RetrievalDTO();
             //封装
             for (ConceptRetrievalDTO conceptRetrievalDTO : conceptInfos.data) {

prec-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
      */

precman-service/src/main/java/com/diagbot/facade/DictionaryFacade.java

@@ -26,7 +26,7 @@ public class DictionaryFacade extends DictionaryInfoServiceImpl {
      */
     public Map<Long, List<DictionaryInfo>> getList() {
         List<DictionaryInfo> list = this.list(new QueryWrapper<DictionaryInfo>()
-                .in("return_type", ListUtil.arrayToList(new Long[]{0L, 1L}))
+                .in("return_type", ListUtil.arrayToList(new Long[] { 0L, 1L }))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .orderByAsc("group_type", "order_no"));
         return EntityUtil.makeEntityListMap(list, "groupType");

precman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -53,7 +53,6 @@ import java.util.stream.Collectors;
 @Component
 public class ModuleInfoFacade extends ModuleInfoServiceImpl {
 
-
     @Autowired
     ModuleDetailFacade moduleDetailFacade;
     @Autowired
@@ -64,6 +63,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     DictionaryFacade dictionaryFacade;
     @Autowired
     KnowledgemanServiceClient knowledgemanServiceClient;
+
     /**
      * 根据id删除标签模板
      *
@@ -73,22 +73,22 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     public Boolean deleteByIdsFac(String ids) {
         //如果是子模板，删除该子模板与其他模板的关联
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-        moduleInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                .eq("id",ids);
+        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", ids);
         ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
         String userId = UserUtils.getCurrentPrincipleID();
         Date date = DateUtil.now();
-        if(null != moduleInfo){
-            if("31".equals(moduleInfo.getType())
+        if (null != moduleInfo) {
+            if ("31".equals(moduleInfo.getType())
                     || "32".equals(moduleInfo.getType())
-                    || "322".equals(moduleInfo.getType())){
+                    || "322".equals(moduleInfo.getType())) {
                 UpdateWrapper<ModuleDetail> moduleDetailUpdateWrapper = new UpdateWrapper<>();
                 moduleDetailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("relation_module", moduleInfo.getId())
                         .set("is_deleted", IsDeleteEnum.Y.getKey())
                         .set("modifier", userId)
-                        .set("gmt_modified",date );
-                moduleDetailFacade.update(new ModuleDetail(),moduleDetailUpdateWrapper);
+                        .set("gmt_modified", date);
+                moduleDetailFacade.update(new ModuleDetail(), moduleDetailUpdateWrapper);
             }
         }
         if (StringUtil.isEmpty(ids)) {
@@ -117,7 +117,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     public Boolean saveOrUpdateModuleInfo(AddModuleInfoVO addModulInfoVO) {
         Long moduleId = null;
         Boolean bac = false;
-        if(addModulInfoVO.getId() == null){
+        if (addModulInfoVO.getId() == null) {
             String userId = UserUtils.getCurrentPrincipleID();
             Date now = DateUtil.now();
             ModuleInfo moduleInfo = new ModuleInfo();
@@ -129,15 +129,15 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             moduleInfo.setType(addModulInfoVO.getType());
             moduleInfo.setModuleType(addModulInfoVO.getModuleType());
             //当添加为科室专用模板时添加关联id
-            if(addModulInfoVO.getModuleType().intValue() == 1){
+            if (addModulInfoVO.getModuleType().intValue() == 1) {
                 moduleInfo.setRelationId(addModulInfoVO.getRelationId());
             }
             this.save(moduleInfo);
             moduleId = moduleInfo.getId();
             bac = moduleDetailFacade.saveOrUpdateInfos(addModulInfoVO, moduleId);
-        }else {
+        } else {
             UpdateModuleInfoVO updateModuleInfoVO = new UpdateModuleInfoVO();
-            BeanUtil.copyProperties(addModulInfoVO,updateModuleInfoVO);
+            BeanUtil.copyProperties(addModulInfoVO, updateModuleInfoVO);
             bac = this.updateModuleInfo(updateModuleInfoVO);
         }
         return bac;
@@ -156,11 +156,11 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("id", updateModuleInfoVO.getId())
                 .set("name", updateModuleInfoVO.getName())
                 .set("type", updateModuleInfoVO.getType())
-                .set("module_type",updateModuleInfoVO.getModuleType())
+                .set("module_type", updateModuleInfoVO.getModuleType())
                 .set("modifier", userId)
                 .set("gmt_modified", DateUtil.now())
-                .set("remark",updateModuleInfoVO.getRemark());
-        if(updateModuleInfoVO.getRelationId() != null){
+                .set("remark", updateModuleInfoVO.getRemark());
+        if (updateModuleInfoVO.getRelationId() != null) {
             moduleInfoUpdateWrapper.set("relation_id", updateModuleInfoVO.getRelationId());
         }
         this.update(new ModuleInfo(), moduleInfoUpdateWrapper);
@@ -183,7 +183,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         List<Long> deptId = new ArrayList<>();
         for (ModuleInfoListDTO moduleInfoListDTO : moduleInfoDTOIPage.getRecords()) {
             ids.add(moduleInfoListDTO.getModifier());
-            if(moduleInfoListDTO.getModuleType().intValue() == 1){
+            if (moduleInfoListDTO.getModuleType().intValue() == 1) {
                 deptId.add(moduleInfoListDTO.getRelationId());
             }
         }
@@ -191,32 +191,33 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(1);
         RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
-        RespDTOUtil.respNGDeal(deptInfoList,"获取科室信息失败");
-        Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+        RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
+        Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
         //获取模板类型名称
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
-        dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+        dictionaryInfoQueryWrapper
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("group_type", 1)
                 .eq("return_type", 1)
                 .orderByDesc("order_no");
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
-        Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal,dictionaryInfo -> dictionaryInfo));
-        if(ListUtil.isNotEmpty(moduleInfoDTOIPage.getRecords())){
+        Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal, dictionaryInfo -> dictionaryInfo));
+        if (ListUtil.isNotEmpty(moduleInfoDTOIPage.getRecords())) {
             //获取用户信息
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-            RespDTOUtil.respNGDeal(respDTO,"获取用户信息失败");
+            RespDTOUtil.respNGDeal(respDTO, "获取用户信息失败");
             //将用户信息放入实体
             for (ModuleInfoListDTO moduleInfoListDTO : moduleInfoDTOIPage.getRecords()) {
                 moduleInfoListDTO.setUserName(respDTO.data.get(moduleInfoListDTO.getModifier()));
-                if(null != dictionaryInfoMap.get(moduleInfoListDTO.getType())){
+                if (null != dictionaryInfoMap.get(moduleInfoListDTO.getType())) {
                     moduleInfoListDTO.setAscriptionName(dictionaryInfoMap.get(moduleInfoListDTO.getType()).getName());
                 }
-                if(moduleInfoListDTO.getModuleType().intValue() == 1){//根据科室
-                    if(moduleInfoListDTO.getRelationId().intValue() != -1){//判断是不是科室通用子模板
-                        if(null != deptInfoMap.get(moduleInfoListDTO.getRelationId())){
+                if (moduleInfoListDTO.getModuleType().intValue() == 1) {//根据科室
+                    if (moduleInfoListDTO.getRelationId().intValue() != -1) {//判断是不是科室通用子模板
+                        if (null != deptInfoMap.get(moduleInfoListDTO.getRelationId())) {
                             moduleInfoListDTO.setRelationName(deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
                         }
-                    }else {
+                    } else {
                         moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
                     }
                 }
@@ -240,17 +241,17 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", getModuleInfoOneVO.getModuleId());
         ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
-        if(null != moduleInfo){
+        if (null != moduleInfo) {
             //获取模板类型名称
-            if(moduleInfo.getModuleType().intValue() == 1){
+            if (moduleInfo.getModuleType().intValue() == 1) {
                 deptId.add(moduleInfo.getRelationId());
             }
             //获取科室名称
             ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
             conceptTypeVO.setType(1);
             RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
-            RespDTOUtil.respNGDeal(deptInfoList,"获取科室信息失败");
-            Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+            RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
+            Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
             //获取模板类型
             BeanUtil.copyProperties(moduleInfo, getModuleInfoOneDTO);
             //获取模板类型名称
@@ -260,13 +261,13 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                     .eq("return_type", 1)
                     .orderByDesc("order_no");
             List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
-            Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal,dictionaryInfo -> dictionaryInfo));
+            Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal, dictionaryInfo -> dictionaryInfo));
             if (null != dictionaryInfoMap.get(getModuleInfoOneDTO.getType())) {
                 getModuleInfoOneDTO.setAscriptionName(dictionaryInfoMap.get(getModuleInfoOneDTO.getType()).getName());
             }
             getModuleInfoOneDTO.setModuleTypeName(ModuleInfoTypeEnum.getName(getModuleInfoOneDTO.getModuleType().intValue()));
-            if(getModuleInfoOneDTO.getModuleType().intValue() == 1){
-                if(null != deptInfoMap.get(getModuleInfoOneDTO.getRelationId())){
+            if (getModuleInfoOneDTO.getModuleType().intValue() == 1) {
+                if (null != deptInfoMap.get(getModuleInfoOneDTO.getRelationId())) {
                     getModuleInfoOneDTO.setRelationName(deptInfoMap.get(getModuleInfoOneDTO.getRelationId()).getName());
                 }
             }
@@ -318,11 +319,11 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      * @param getModuleTypeVO
      * @return
      */
-    public List<GetModuleTypeDTO> getModuleType(GetModuleTypeVO getModuleTypeVO){
+    public List<GetModuleTypeDTO> getModuleType(GetModuleTypeVO getModuleTypeVO) {
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("module_Type", getModuleTypeVO.getModuleType());
-        if(getModuleTypeVO.getRelationId() != null){
+        if (getModuleTypeVO.getRelationId() != null) {
             moduleInfoQueryWrapper.eq("relation_id", getModuleTypeVO.getRelationId());
         }
         List<ModuleInfo> moduleInfos = this.list(moduleInfoQueryWrapper);
@@ -333,7 +334,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("group_type", 1)
                 .eq("return_type", 1)
                 .orderByAsc("order_no")
-                .notIn("val",types);
+                .notIn("val", types);
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
         List<GetModuleTypeDTO> getModuleTypeDTOS = new ArrayList<>();
         for (DictionaryInfo dictionaryInfo : dictionaryInfoList) {
@@ -350,26 +351,26 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      *
      * @return
      */
-    public GetAllDeptAndDisInfoDTO getAllDeptAndDisInfo(GetAllDeptAndDisInfoVO getAllDeptAndDisInfoVO){
+    public GetAllDeptAndDisInfoDTO getAllDeptAndDisInfo(GetAllDeptAndDisInfoVO getAllDeptAndDisInfoVO) {
         //获取所有科室
         ConceptTypeVO deptType = new ConceptTypeVO();
         deptType.setType(1);
         RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(deptType);
-        RespDTOUtil.respNGDeal(deptInfoList,"获取科室信息失败");
-        if(getAllDeptAndDisInfoVO.getModuleType() != null && getAllDeptAndDisInfoVO.getModuleType().intValue() == 1){//过滤添加过得科室
-            List<ModuleInfo> moduleInfoList = getModuleInfos(getAllDeptAndDisInfoVO.getModuleType(),getAllDeptAndDisInfoVO.getType());
+        RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
+        if (getAllDeptAndDisInfoVO.getModuleType() != null && getAllDeptAndDisInfoVO.getModuleType().intValue() == 1) {//过滤添加过得科室
+            List<ModuleInfo> moduleInfoList = getModuleInfos(getAllDeptAndDisInfoVO.getModuleType(), getAllDeptAndDisInfoVO.getType());
             List<Long> deptIds = moduleInfoList.stream().map(ModuleInfo::getRelationId).collect(Collectors.toList());
             Iterator<ConceptBaseDTO> deptIterator = deptInfoList.data.iterator();
             for (Long deptId : deptIds) {
-                while (deptIterator.hasNext()){
+                while (deptIterator.hasNext()) {
                     Long deptConceptId = deptIterator.next().getConceptId();
-                    if(deptId.intValue() == deptConceptId.intValue()){
+                    if (deptId.intValue() == deptConceptId.intValue()) {
                         deptIterator.remove();
                     }
                 }
             }
         }
-        List<DeptDTO> deptDTOS = BeanUtil.listCopyTo(deptInfoList.data,DeptDTO.class);
+        List<DeptDTO> deptDTOS = BeanUtil.listCopyTo(deptInfoList.data, DeptDTO.class);
         GetAllDeptAndDisInfoDTO getAllDeptAndDisInfoDTO = new GetAllDeptAndDisInfoDTO();
         getAllDeptAndDisInfoDTO.setDeptDTOS(deptDTOS);
         return getAllDeptAndDisInfoDTO;
@@ -382,11 +383,11 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      * @param type
      * @return
      */
-    public List<ModuleInfo> getModuleInfos(Long moduleType,String type){
+    public List<ModuleInfo> getModuleInfos(Long moduleType, String type) {
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-        moduleInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                .eq("module_type",moduleType)
-                .eq("type",type);
+        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("module_type", moduleType)
+                .eq("type", type);
         return this.list(moduleInfoQueryWrapper);
     }
 }

precman-service/src/main/java/com/diagbot/facade/QuestionDetailFacade.java

@@ -63,7 +63,6 @@ public class QuestionDetailFacade extends QuestionDetailServiceImpl {
     }
 
 
-
     /**
      * 根据id获取标签明细
      *

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

@@ -77,6 +77,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     ModuleDetailFacade moduleDetailFacade;
     @Autowired
     ModuleInfoFacade moduleInfoFacade;
+
     /**
      * 标签保存
      *
@@ -316,11 +317,11 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 List<String> moduleNames = moduleInfoFacade.list(new QueryWrapper<ModuleInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .in("id", moduleIds))
-                        .stream().map(row ->  row.getName()).collect(Collectors.toList());
-                for (String mouduleName: moduleNames) {
-                    if(moduleNames.get(moduleNames.size()-1).equals(mouduleName)){//如果当前元素是最后一个，不追加顿号
+                        .stream().map(row -> row.getName()).collect(Collectors.toList());
+                for (String mouduleName : moduleNames) {
+                    if (moduleNames.get(moduleNames.size() - 1).equals(mouduleName)) {//如果当前元素是最后一个，不追加顿号
                         errMsg.append("【" + mouduleName + "】");
-                    }else {
+                    } else {
                         errMsg.append("【" + mouduleName + "】").append("、");
                     }
                 }

precman-service/src/main/java/com/diagbot/web/UploadController.java

@@ -3,8 +3,6 @@ package com.diagbot.web;
 import com.diagbot.dto.FileDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.UploadFacade;
-import com.diagbot.util.FastJsonUtils;
-import com.diagbot.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 @RestController
 @Api(value = "文件上传API", tags = { "文件上传API" })
 @RequestMapping(value = "/file_prec")

uaa-service/src/main/java/com/diagbot/service/UrlUserService.java

@@ -36,7 +36,8 @@ public class UrlUserService implements UserDetailsService {
             List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
             for (Permission permission : permissions) {
                 if (null != permission && StringUtils.isNotBlank(permission.getPermissionUrl())) {
-                    GrantedAuthority grantedAuthority = new UrlGrantedAuthority(permission.getPermissionUrl(), permission.getMethod());
+                    GrantedAuthority grantedAuthority
+                            = new UrlGrantedAuthority(permission.getPermissionUrl(), permission.getMethod());
                     grantedAuthorities.add(grantedAuthority);
                 }
             }

user-service/src/main/java/com/diagbot/facade/PermissionFacade.java

@@ -26,6 +26,7 @@ public class PermissionFacade extends PermissionServiceImpl {
 
     /**
      * 获取资源信息
+     *
      * @param appkey 参数
      * @param secret 参数
      * @return 资源信息
@@ -33,11 +34,13 @@ public class PermissionFacade extends PermissionServiceImpl {
     public RespDTO getPermission(String appkey, String secret) {
         User user = userFacade.findByName(appkey);
         if (null == user) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "未找到对应的appkey【" + appkey + "】");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "未找到对应的appkey【" + appkey + "】");
         }
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         if (!passwordEncoder.matches(secret, user.getPassword())) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "appkey 或 secret 错误【" + appkey + "," + secret + "】");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "appkey 或 secret 错误【" + appkey + "," + secret + "】");
         }
         List<Permission> permissions = this.getPermissionByUserId(user.getId());
         return RespDTO.onSuc(permissions);

user-service/src/main/java/com/diagbot/facade/UserAuthenticationFacade.java

@@ -248,28 +248,28 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         waitAuthenDTO.setCount(count);
         return waitAuthenDTO;
     }
-    
-    public List<Integer> getAuthInfoCount(Long userId){
-    	List<Integer> ret = new ArrayList<>();
-    	Integer authIngCount = 0;
-    	Integer authRejectCount = 0;
-    	User user = userFacade.getById(userId);
-    	if(user.getAuthStatus()==2){
-    		authIngCount = 1;
-    	}else if(user.getAuthStatus()==0){
-    		 QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
-    	     qw.eq("user_id", userId).
-    	                eq("is_deleted", IsDeleteEnum.N.getKey()).
-    	                orderByDesc("gmt_create");
-    	     UserAuthentication userAuthentication = this.getOne(qw, false);
-    	     if(userAuthentication!=null&&userAuthentication.getIsReject()==0){
-    	    	 authRejectCount = 1;
-    	     }
-    	}
-    	
-    	ret.add(authIngCount);
-    	ret.add(authRejectCount);
-    
-    	return ret;
+
+    public List<Integer> getAuthInfoCount(Long userId) {
+        List<Integer> ret = new ArrayList<>();
+        Integer authIngCount = 0;
+        Integer authRejectCount = 0;
+        User user = userFacade.getById(userId);
+        if (user.getAuthStatus() == 2) {
+            authIngCount = 1;
+        } else if (user.getAuthStatus() == 0) {
+            QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
+            qw.eq("user_id", userId).
+                    eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    orderByDesc("gmt_create");
+            UserAuthentication userAuthentication = this.getOne(qw, false);
+            if (userAuthentication != null && userAuthentication.getIsReject() == 0) {
+                authRejectCount = 1;
+            }
+        }
+
+        ret.add(authIngCount);
+        ret.add(authRejectCount);
+
+        return ret;
     }
 }

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -65,7 +65,6 @@ import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
 import com.diagbot.vo.UserSaveVO;
 import com.diagbot.vo.UsernameVO;
-
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
@@ -136,7 +135,8 @@ public class UserFacade extends UserServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请输入正确的手机号");
         }
 
-        verFacade.verifyImgVerification(imgVerVerVO); //保存时再次校验图形验证码，主要是为了防止跳过前端校验直接调用接口
+        //保存时再次校验图形验证码，主要是为了防止跳过前端校验直接调用接口
+        verFacade.verifyImgVerification(imgVerVerVO);
 
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
@@ -268,7 +268,8 @@ public class UserFacade extends UserServiceImpl {
             paramMap1.put("is_deleted", IsDeleteEnum.N.getKey());
             List<UserOrganization> res1 = userOrganizationFacade.selectByMap(paramMap1);
             if (ListUtil.isNotEmpty(res1)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户，不能再添加别的用户");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "该机构下已存在用户，不能再添加别的用户");
             }
         }
 
@@ -391,7 +392,8 @@ public class UserFacade extends UserServiceImpl {
         if (!passwordEncoder.matches(password, user.getPassword())) {
             throw new CommonException(ServiceErrorCode.USER_PASSWORD_ERROR);
         }
-        JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", "password", username, password);
+        JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
+                "password", username, password);
         if (null == jwt) {
             throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
         }
@@ -425,7 +427,8 @@ public class UserFacade extends UserServiceImpl {
             throw new CommonException(CommonErrorCode.TOKEN_PAST);
         }
 
-        JWT jwt = authServiceClient.refreshToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", "refresh_token", refreshToken);
+        JWT jwt = authServiceClient.refreshToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
+                "refresh_token", refreshToken);
         if (null == jwt) {
             throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
         }
@@ -452,7 +455,8 @@ public class UserFacade extends UserServiceImpl {
                     "令牌不能为空");
         }
 
-        OAuth2AccessToken jwt = authServiceClient.checkToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", token);
+        OAuth2AccessToken jwt
+                = authServiceClient.checkToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", token);
         if (null == jwt) {
             throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
         }
@@ -588,7 +592,8 @@ public class UserFacade extends UserServiceImpl {
                     "用户不存在【" + userId + "】");
         }
 
-        PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+        PasswordEncoder passwordEncoder
+                = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         if (!passwordEncoder.matches(password, user.getPassword())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "原密码错误");
         }
@@ -610,7 +615,8 @@ public class UserFacade extends UserServiceImpl {
      */
     //@CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User saveUser(User user) {
-        PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+        PasswordEncoder passwordEncoder
+                = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
         user.setPassword(entryPassword);
         user.setGmtCreate(new Date());
@@ -627,7 +633,8 @@ public class UserFacade extends UserServiceImpl {
      */
     //@CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User updateUser(User user) {
-        PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+        PasswordEncoder passwordEncoder
+                = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
         user.setPassword(entryPassword);
         user.setGmtModified(new Date());
@@ -1131,10 +1138,8 @@ public class UserFacade extends UserServiceImpl {
             userIds.add(userInfoId);
         }
         if (userIds.size() > 0) {
-
-
-            RespDTO<List<UserAndProdutDTO>> InformationData = diagbotmanClient.getInformationAvailableAll(userIds);
-
+            RespDTO<List<UserAndProdutDTO>> InformationData
+                    = diagbotmanClient.getInformationAvailableAll(userIds);
             if (InformationData == null || !"0".equals(InformationData.code)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         "获取所有开通信息失败");
@@ -1165,7 +1170,9 @@ public class UserFacade extends UserServiceImpl {
      * @param userName
      * @return
      */
-    public RespDTO<IPage<AuthenticationDTO>> queryAuthentications(Page page, String orgName, String userName, String startTime, String endTime) {
+    public RespDTO<IPage<AuthenticationDTO>> queryAuthentications(Page page, String orgName,
+                                                                  String userName, String startTime,
+                                                                  String endTime) {
         CustomerDTO userInfo = new CustomerDTO();
         if (userName != null && userName.length() != 0) {
             userInfo.setUserName(userName);
@@ -1441,14 +1448,14 @@ public class UserFacade extends UserServiceImpl {
      */
     public Map<String, String> getUserInfoByIds(List<String> ids) {
         List<Long> longList
-                = ids.stream().map(r->Long.valueOf(r)).distinct().collect(Collectors.toList());
+                = ids.stream().map(r -> Long.valueOf(r)).distinct().collect(Collectors.toList());
 
         Map<String, String> map = new HashMap<>();
-        if (ListUtil.isNotEmpty(longList)){
+        if (ListUtil.isNotEmpty(longList)) {
             List<User> userList = this.getByIds(longList);
-            if (ListUtil.isNotEmpty(userList)){
+            if (ListUtil.isNotEmpty(userList)) {
                 map = userList.stream()
-                        .collect(Collectors.toMap(k->k.getId().toString(), v->v.getLinkman()));
+                        .collect(Collectors.toMap(k -> k.getId().toString(), v -> v.getLinkman()));
             }
         }
         return map;

user-service/src/main/java/com/diagbot/facade/VerFacade.java

@@ -104,7 +104,8 @@ public class VerFacade {
             //验证是否超过三分钟
             SwsVerInfo swsVerInfoCheck = smsVerService.getSmsVerification(smsVerCreatVO.getMobile());
             if (null != swsVerInfoCheck) {
-                if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(), ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
+                if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(),
+                        ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
                         DateUtil.now())) {
                     throw new CommonException(ServiceErrorCode.SMS_SEND_ERROR,
                             "同一用户三分钟之内不能重复发送验证短信，请三分钟之后再次发送");
@@ -158,7 +159,8 @@ public class VerFacade {
         //验证是否超过三分钟
         SwsVerInfo swsVerInfoCheck = smsVerService.getSmsVerification(smsVerCreatVO.getMobile());
         if (null != swsVerInfoCheck) {
-            if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(), ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
+            if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(),
+                    ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
                     DateUtil.now())) {
                 throw new CommonException(ServiceErrorCode.SMS_SEND_ERROR,
                         "同一用户三分钟之内不能重复发送验证短信，请三分钟之后再次发送");
@@ -227,7 +229,8 @@ public class VerFacade {
         swsVerInfo.setCode(smsVerVerVO.getSmsCode());
         Boolean smsVer = smsVerService.verifySmsVerification(swsVerInfo);
         if (!smsVer) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "短信验证码输入有误，请重新输入");
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
+                    "短信验证码输入有误，请重新输入");
         }
         return true;
     }

user-service/src/main/java/com/diagbot/service/impl/ImgVerServiceImpl.java

@@ -2,8 +2,8 @@ package com.diagbot.service.impl;
 
 import com.diagbot.entity.ImgVerInfo;
 import com.diagbot.enums.ConstantEnum;
-import com.diagbot.exception.CommonException;
 import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.ImgVerService;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;

user-service/src/main/java/com/diagbot/service/impl/SmsVerServiceImpl.java

@@ -118,7 +118,7 @@ public class SmsVerServiceImpl implements SmsVerService {
                     "验证码不能为空");
         }
         swsVerInfo.setCreateTime(DateUtil.now());
-        final Date expireDate = DateUtil.addMinutes(DateUtil.now(),  ConstantEnum.SMS_EXPIRED_INTERVAL.getKey());
+        final Date expireDate = DateUtil.addMinutes(DateUtil.now(), ConstantEnum.SMS_EXPIRED_INTERVAL.getKey());
         swsVerInfo.setExpireTime(expireDate);
         swsVerInfo.setExpireTimeStr(DateUtil.format(expireDate, "yyyy-MM-dd HH:mm:ss"));
         final byte[] redis_key = getUserSmsKey(swsVerInfo.getMobile());

user-service/src/main/java/com/diagbot/service/impl/TokenServiceImpl.java

@@ -109,14 +109,14 @@ public class TokenServiceImpl implements TokenService {
             }
         });
 
-        if (null != tokenStore){
-            if (type == 1){
+        if (null != tokenStore) {
+            if (type == 1) {
                 if (null != tokenStore.getAccessToken() && tokenStore.getAccessToken().equals(token)) {
                     res = true;
                 }
             }
 
-            if (type == 2){
+            if (type == 2) {
                 if (null != tokenStore.getRefreshToken() && tokenStore.getRefreshToken().equals(token)) {
                     res = true;
                 }
@@ -127,12 +127,13 @@ public class TokenServiceImpl implements TokenService {
     }
 
     /**
-     *  删除用户token
+     * 删除用户token
+     *
      * @param userId 用户ID
      * @return 删除是否成功
      */
     @Override
-    public Boolean deleteToken(String userId){
+    public Boolean deleteToken(String userId) {
         final byte[] redis_key = getUserTokenKey(userId);
         Long l = (Long) redisForToken.execute(new RedisCallback<Long>() {
             @Override

user-service/src/main/java/com/diagbot/service/impl/UserAuthenticationServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.UserAuthentication;
 import com.diagbot.mapper.UserAuthenticationMapper;
 import com.diagbot.service.UserAuthenticationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

user-service/src/main/java/com/diagbot/service/impl/UserOrganizationServiceImpl.java

@@ -28,6 +28,7 @@ public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMap
     public List<UserOrganization> selectByMap(Map map) {
         return baseMapper.selectByMap(map);
     }
+
     //根据机构id查绑定的用户
     @Override
     public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG) {

user-service/src/main/java/com/diagbot/service/impl/UserRoleServiceImpl.java

@@ -16,5 +16,4 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
 
-
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -54,20 +54,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo) {
         return baseMapper.selectUserInfoListPage(page, userInfo);
-
     }
 
     @Override
     public boolean updateUserInfoAll(Map<String, Object> userMap) {
         return baseMapper.updateUserInfoAll(userMap);
-
     }
 
     //删除用户信息和机构信息
     @Override
     public boolean updateDeleted(Map<String, Object> map) {
         return baseMapper.updateDeleted(map);
-
     }
 
     @Override
@@ -91,81 +88,79 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
         return baseMapper.getUserOrgDTOByIds(userIds);
     }
-    
+
     //审核用户信息和机构信息
     @Override
     public boolean auditUserInfoAll(Map<String, Object> auditMap) {
-        
         return baseMapper.auditUserInfoAll(auditMap);
     }
+
     //导出用户和机构信息
     @Override
     public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map) {
-
         return baseMapper.dependentuserInfoByTime(map);
     }
-    
-  //导出认证中用户和机构信息
+
+    //导出认证中用户和机构信息
     @Override
-    public List<AuthenticationDTO> exportKema(Map<String, Object> map){
-    	return baseMapper.exportKema(map);
+    public List<AuthenticationDTO> exportKema(Map<String, Object> map) {
+        return baseMapper.exportKema(map);
     }
+
     @Override
     public List<User> getUserByOrgName(String orgName) {
         return baseMapper.getUserByOrgName(orgName);
     }
+
     //分页查询注册用户信息接口
     @Override
-    public IPage<UserAllDTO> queryUserInformation(Page page, CustomerDTO userInfo){
-    	 return baseMapper.queryUserInformation(page, userInfo);
+    public IPage<UserAllDTO> queryUserInformation(Page page, CustomerDTO userInfo) {
+        return baseMapper.queryUserInformation(page, userInfo);
     }
+
     //分页查询机构信息接口
     @Override
-    public IPage<OrganizationDTO> queryMechanismInformation(Page page, CustomerDTO userInfo){
-    	return baseMapper.queryMechanismInformation(page, userInfo);
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page, CustomerDTO userInfo) {
+        return baseMapper.queryMechanismInformation(page, userInfo);
     }
 
     //分页查询已认证用户信息和机构信息及开通产品接口
-	@Override
-	public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, CustomerDTO userInfo) {
-		
-		return baseMapper.queryVerifiedUserOrganizationProduct(page, userInfo);
-	}
-
-	//分页查询认证中的用户信息接口
-	@Override
-	public IPage<AuthenticationDTO> queryAuthentication(Page page, CustomerDTO userInfo) {
-		
-		return baseMapper.queryAuthentication(page, userInfo);
-	}
-
-	//超管修改用户信息接口
-	@Override
-	public boolean updateUserInfo(Map<String, Object> amendUserInfo) {
-		
-		return baseMapper.updateUserInfo(amendUserInfo);
-	}
-
-	//机构信息修改接口
-	@Override
-	public boolean updateOrganizations(Map<String, Object> amendOrg) {
-		
-		return baseMapper.updateOrganizations(amendOrg);
-	}
-
-	@Override
-	public List<UserInfoDTO> exportOrganizations(Map<String, Object> map) {
-		
-		return baseMapper.exportOrganizations(map);
-	}
-	
-	@Override
-	public List<UserInfoDTO> exportVerified(Map<String, Object> map){
-		return baseMapper.exportVerified(map);
-	}
+    @Override
+    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, CustomerDTO userInfo) {
+        return baseMapper.queryVerifiedUserOrganizationProduct(page, userInfo);
+    }
+
+    //分页查询认证中的用户信息接口
+    @Override
+    public IPage<AuthenticationDTO> queryAuthentication(Page page, CustomerDTO userInfo) {
+        return baseMapper.queryAuthentication(page, userInfo);
+    }
+
+    //超管修改用户信息接口
+    @Override
+    public boolean updateUserInfo(Map<String, Object> amendUserInfo) {
+        return baseMapper.updateUserInfo(amendUserInfo);
+    }
+
+    //机构信息修改接口
+    @Override
+    public boolean updateOrganizations(Map<String, Object> amendOrg) {
+        return baseMapper.updateOrganizations(amendOrg);
+    }
+
+    @Override
+    public List<UserInfoDTO> exportOrganizations(Map<String, Object> map) {
+        return baseMapper.exportOrganizations(map);
+    }
+
+    @Override
+    public List<UserInfoDTO> exportVerified(Map<String, Object> map) {
+        return baseMapper.exportVerified(map);
+    }
 
     /**
      * 获取用户信息
+     *
      * @return 用户信息
      */
     @Override

user-service/src/main/java/com/diagbot/web/ReportFormController.java

@@ -5,14 +5,13 @@ import com.diagbot.facade.UserFacade;
 import com.diagbot.vo.UserExportVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -36,45 +35,49 @@ public class ReportFormController {
     @SysLoggerExport("exportUserInfoAll")
     @ResponseBody
     @ApiIgnore
-    public  void export(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void export(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.export(userExportVO, response);
-        
+        userFacade.export(userExportVO, response);
+
     }
+
     @ApiOperation(value = "导出用户信息(新):[by:wangfeng]", notes = "根据时间 导出用户信息")
     @PostMapping("/exportUserInfo")
     @SysLoggerExport("exportUserInfo")
     @ResponseBody
-    public  void exportUserInfo(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportUserInfo(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.exportUserInfo(userExportVO, response);
-        
+        userFacade.exportUserInfo(userExportVO, response);
+
     }
+
     @ApiOperation(value = "导出机构信息(新):[by:wangfeng]", notes = "根据时间 导出用户信息和机构信息")
     @PostMapping("/exportOrganization")
     @SysLoggerExport("exportOrganization")
     @ResponseBody
-    public  void exportOrganization(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportOrganization(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.exportOrganization(userExportVO, response);
-        
+        userFacade.exportOrganization(userExportVO, response);
+
     }
+
     @ApiOperation(value = "导出认证中用户的信息(新):[by:wangfeng]", notes = "导出认证中用户的信息")
     @PostMapping("/exportKema")
     @SysLoggerExport("exportKema")
     @ResponseBody
-    public  void exportKema(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportKema(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.exportKema(userExportVO, response);
-        
+        userFacade.exportKema(userExportVO, response);
+
     }
+
     @ApiOperation(value = "导出已认证用户的信息(新):[by:wangfeng]", notes = "根据时间 导出已认证用户的信息")
     @PostMapping("/exportVerified")
     @SysLoggerExport("exportVerified")
     @ResponseBody
-    public  void exportVerified (@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportVerified(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.exportVerified(userExportVO, response);
-        
+        userFacade.exportVerified(userExportVO, response);
+
     }
 }

user-service/src/main/java/com/diagbot/web/UserAuthenticationController.java

@@ -11,18 +11,16 @@ import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.vo.UserAuthenticationVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -97,7 +95,7 @@ public class UserAuthenticationController {
     public RespDTO<WaitAuthenDTO> waitAuthen() {
         return RespDTO.onSuc(userAuthenticationFacade.waitAuthen());
     }
-    
+
     @PostMapping(value = "/getAuthInfoCount")
     @SysLogger("getAuthInfoCount")
     @ApiOperation(value = "远程调用，根据用户id获取用户认证信息[by:rgb]")

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -76,7 +76,6 @@ public class UserController {
     }
 
 
-
     @ApiOperation(value = "验证token有效性[by:zhoutg]",
             notes = "token：token信息，必填<br>")
     @PostMapping("/verifyToken")
@@ -88,7 +87,6 @@ public class UserController {
     }
 
 
-
     @ApiOperation(value = "校验用户(手机号)已注册[by:zhoutg]",
             notes = "username：用户名(手机号)，必填<br>")
     @PostMapping("/verifyExistUsername")
@@ -352,7 +350,7 @@ public class UserController {
     @PostMapping("/getUserInfoByIds")
     @SysLogger("getUserInfoByIds")
     @ApiIgnore
-    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids){
+    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids) {
         return RespDTO.onSuc(userFacade.getUserInfoByIds(ids));
     }
 }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -1,31 +1,11 @@
 package com.diagbot.web;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import com.diagbot.vo.UserInfoPagVO;
-import com.diagbot.vo.UserOrganProductPageVO;
-import com.diagbot.vo.UsernameVO;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.AuthenticationDTO;
 import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAllDTO;
-import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.facade.OrganizationFacade;
@@ -40,11 +20,18 @@ import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrgPageVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
-import com.diagbot.vo.UserInfoOrganizationsVO;
-
+import com.diagbot.vo.UserInfoPagVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @Description: 外部用户信息
@@ -93,16 +80,17 @@ public class UserInfoController {
     @SysLogger("auditUserInfoAllPass")
     @Transactional
     public RespDTO<Boolean> auditUserInfoAllPass(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
-    	int ByType = 1;
-    	return userFacade.auditUserInfoAlls(userInfoAuditVO,ByType);
+        int ByType = 1;
+        return userFacade.auditUserInfoAlls(userInfoAuditVO, ByType);
     }
+
     @ApiOperation(value = "认证用户信息和机构信息不通过接口(新)[by:wangfeng]", notes = "审核用户信息和机构信息不通过")
     @PostMapping("/auditUserInfoAllNopass")
     @SysLogger("auditUserInfoAllNopass")
     @Transactional
     public RespDTO<Boolean> auditUserInfoAllNopass(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
         int ByType = 2;
-    	return userFacade.auditUserInfoAlls(userInfoAuditVO,ByType);
+        return userFacade.auditUserInfoAlls(userInfoAuditVO, ByType);
     }
 
     @ApiOperation(value = "删除用户信息和机构信息接口(新)[by:wangfeng]", notes = "用户信息和机构信息")
@@ -118,7 +106,7 @@ public class UserInfoController {
     @SysLogger("findOrganization")
     public RespDTO<Organization> findOrganization(@RequestBody OrganizationNameVO organizationNameVO) {
         // TODO 返回机构Id和机构
-    	String organizationName = organizationNameVO.getOrganizationName();
+        String organizationName = organizationNameVO.getOrganizationName();
         List<Organization> organization = organizationFacade.findOrganization(organizationName);
 
         return RespDTO.onSuc(organization);
@@ -151,56 +139,56 @@ public class UserInfoController {
 
         return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAuthStatus());
     }*/
-    
+
     @ApiOperation(value = "分页查询注册用户信息接口(新)[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/queryUserInformation")
     @SysLogger("queryUserInformation")
-    public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO){
-    	
-    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getUserName(), userInfoPagVO.getAuthStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
+    public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO) {
+
+        return userFacade.queryUserInformations(userInfoPagVO, userInfoPagVO.getUserName(), userInfoPagVO.getAuthStatus(), userInfoPagVO.getStartTime(), userInfoPagVO.getEndTime());
     }
-    
-    
+
+
     @ApiOperation(value = "分页查询机构信息接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryMechanismInformation")
     @SysLogger("queryMechanismInformation")
-    public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO){
-    	
-    	return userFacade.queryMechanismInformations(userInfoPagVO,userInfoPagVO.getOrgName(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
+    public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO) {
+
+        return userFacade.queryMechanismInformations(userInfoPagVO, userInfoPagVO.getOrgName(), userInfoPagVO.getStartTime(), userInfoPagVO.getEndTime());
     }
-    
-    
+
+
     @ApiOperation(value = "分页查询已认证用户信息和机构信息及开通产品接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryVerifiedUserOrganizationProduct")
     @SysLogger("queryVerifiedUserOrganizationProduct")
     public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProduct(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
-		
-		return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
-	}
-   
+
+        return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO, userAndOrgPageVO.getOrgName(), userAndOrgPageVO.getUserName(), userAndOrgPageVO.getStartTime(), userAndOrgPageVO.getEndTime());
+    }
+
     @ApiOperation(value = "分页查询认证中的用户信息接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryAuthentication")
     @SysLogger("queryAuthentication")
-	public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
-		
-		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
-	} 
-    
+    public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
+
+        return userFacade.queryAuthentications(userAndOrgPageVO, userAndOrgPageVO.getOrgName(), userAndOrgPageVO.getUserName(), userAndOrgPageVO.getStartTime(), userAndOrgPageVO.getEndTime());
+    }
+
     @ApiOperation(value = "超管修改用户信息接口（新）[by:wangfeng]", notes = "用户id必传")
     @PostMapping("/updateUserInfo")
     @SysLogger("updateUserInfo")
     @Transactional
-    public RespDTO<Boolean> updateUserInfo (@RequestBody AmendUserInfoVO amendUserInfoVO){
-		return userFacade.updateUserInfos(amendUserInfoVO);
-    	
+    public RespDTO<Boolean> updateUserInfo(@RequestBody AmendUserInfoVO amendUserInfoVO) {
+        return userFacade.updateUserInfos(amendUserInfoVO);
+
     }
-    
+
     @ApiOperation(value = "机构信息修改接口(新)[by:wangfeng]", notes = "机构id必传")
     @PostMapping("/updateOrganizations")
     @SysLogger("updateOrganizations")
     @Transactional
-    public RespDTO<Boolean> updateOrganization (@RequestBody AmendOrgVO amendOrgVO){
-		return userFacade.updateOrganizations(amendOrgVO);
-    	
+    public RespDTO<Boolean> updateOrganization(@RequestBody AmendOrgVO amendOrgVO) {
+        return userFacade.updateOrganizations(amendOrgVO);
+
     }
 }