Merge branch 'dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190924_diagnose2

# Conflicts:
#	knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseFacade.java
#	knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseImportFacade.java

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

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

@@ -25,7 +25,8 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
     public List<DisclaimerInformationDTO> getDisclaimerInformation() {
 
         QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
-        disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey())
+        disclaimerInformation
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByAsc("order_no");
         List<DisclaimerInformation> data = list(disclaimerInformation);

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

@@ -76,7 +76,7 @@ public class IndexDataFacade {
         for (String key : dataMap.keySet()) {
             IndexDTO itemIndexDTO = new IndexDTO();
             itemIndexDTO.setItemName(key);
-            
+
             List<String> indexUnits = new ArrayList<String>();
             List<String> indexValues = new ArrayList<String>();
             List<Integer> isAbnormals = new ArrayList<Integer>();

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

@@ -44,7 +44,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         }
         //查询最新的一条版本信息
         QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+        versionInfoQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("product_type", versionVO.getProductType())
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByDesc("gmt_modified");

aipt-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -34,7 +34,9 @@ public class IndexDataController {
     @Autowired
     IndexDataFacade indexDataFacade;
 
-    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]",
+                  notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> " +
+                          "startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
@@ -42,7 +44,11 @@ public class IndexDataController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]",
+                  notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> " +
+                          "IndexData：{指标公表名 :indexUnique;" +
+                          "指标值indexValue;指标单位 indexUnit;是否异常 " +
+                          "isAbnormal;化验时间creatTime;}")
     @PostMapping("/saveIndexDatas")
     @SysLogger("saveIndexDatas")
     @Transactional

data-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月27日 下午3:36:14
@@ -18,16 +17,16 @@ import java.util.List;
 @Component
 public class DisclaimerInformationFacade {
 
-	@Autowired
-	private AiptServiceClient aiptServiceClient;
-	/**
-	 * 
-	 * @return
-	 */
-	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
-		RespDTO<List<DisclaimerInformationDTO>> res =  aiptServiceClient.getDisclaimerInformations();
-		RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
-		return res.data;
-	}
+    @Autowired
+    private AiptServiceClient aiptServiceClient;
+
+    /**
+     * @return
+     */
+    public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+        RespDTO<List<DisclaimerInformationDTO>> res = aiptServiceClient.getDisclaimerInformations();
+        RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
+        return res.data;
+    }
 
 }

data-service/src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -1,18 +1,16 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.HospitalSetVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年6月18日 上午10:16:47
@@ -20,18 +18,18 @@ import com.diagbot.vo.HospitalSetVO;
 @Component
 public class SysSetFacade {
 
-	@Autowired
-	TranServiceClient tranServiceClient;
+    @Autowired
+    TranServiceClient tranServiceClient;
 
-	/**
-	 * 根据医院code获取配置信息
-	 * 
-	 * @return
-	 */
-	public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
-		RespDTO<List<SysSetInfoDTO>> sysSetInfoLists = tranServiceClient.getSysSetInfoDatas(hospitalSetVO);
-		RespDTOUtil.respNGDeal(sysSetInfoLists, "获取配置数据失败！");
-		return sysSetInfoLists.data;
-	}
+    /**
+     * 根据医院code获取配置信息
+     *
+     * @return
+     */
+    public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
+        RespDTO<List<SysSetInfoDTO>> sysSetInfoLists = tranServiceClient.getSysSetInfoDatas(hospitalSetVO);
+        RespDTOUtil.respNGDeal(sysSetInfoLists, "获取配置数据失败！");
+        return sysSetInfoLists.data;
+    }
 
 }

data-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -19,6 +19,7 @@ public class VersionInfoFacade {
 
     @Autowired
     private AiptServiceClient aiptServiceClient;
+
     /**
      * 查询版本信息
      *

data-service/src/main/java/com/diagbot/web/MrController.java

@@ -26,22 +26,22 @@ import javax.validation.Valid;
 @SuppressWarnings("unchecked")
 public class MrController {
 
-	@Autowired
-	private MrFacade mrFacade;
+    @Autowired
+    private MrFacade mrFacade;
 
-	@ApiOperation(value = "保存病历信息:[by:gaodm]",
-			notes = "")
-	@PostMapping("/createMr")
-	@SysLogger("createMr")
-	public RespDTO<String> createMr(@RequestBody PushJoinVO pushJoinVO) {
-		return RespDTO.onSuc(mrFacade.createMr(pushJoinVO));
-	}
+    @ApiOperation(value = "保存病历信息:[by:gaodm]",
+            notes = "")
+    @PostMapping("/createMr")
+    @SysLogger("createMr")
+    public RespDTO<String> createMr(@RequestBody PushJoinVO pushJoinVO) {
+        return RespDTO.onSuc(mrFacade.createMr(pushJoinVO));
+    }
 
-	@ApiOperation(value = "获取病历信息 :[by:gaodm]",
-			notes = "mrId: 病历编号，必填<br>")
-	@PostMapping("/getMr")
-	@SysLogger("getMr")
-	public RespDTO<PushJoinVO> getMr(@RequestBody @Valid MrVO mrVO) {
-		return RespDTO.onSuc(mrFacade.getMr(mrVO));
-	}
+    @ApiOperation(value = "获取病历信息 :[by:gaodm]",
+            notes = "mrId: 病历编号，必填<br>")
+    @PostMapping("/getMr")
+    @SysLogger("getMr")
+    public RespDTO<PushJoinVO> getMr(@RequestBody @Valid MrVO mrVO) {
+        return RespDTO.onSuc(mrFacade.getMr(mrVO));
+    }
 }

data-service/src/main/java/com/diagbot/web/SysSetController.java

@@ -31,16 +31,16 @@ import java.util.List;
 @SuppressWarnings("unchecked")
 public class SysSetController {
 
-	@Autowired
-	SysSetFacade sysSetFacade;
-	
-	@ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode ：医院code  必填<br> ")
-	@PostMapping("/getSysSetInfoDatas")
-	@SysLogger("getSysSetInfoDatas")
-	public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
-
-		 List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
-
-		return RespDTO.onSuc(data);
-	}
+    @Autowired
+    SysSetFacade sysSetFacade;
+
+    @ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode ：医院code  必填<br> ")
+    @PostMapping("/getSysSetInfoDatas")
+    @SysLogger("getSysSetInfoDatas")
+    public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
+
+        List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+
+        return RespDTO.onSuc(data);
+    }
 }

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/FeatureFacade.java

@@ -57,7 +57,9 @@ public class FeatureFacade {
     public List<FeatureConceptDTO> addQuestionId(List<FeatureConceptDTO> concepts, Integer type) {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).in("tag_name", nameList).eq("type", type);
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("tag_name", nameList)
+                .eq("type", type);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         if (ListUtil.isNotEmpty(questionInfoList)) {
             Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");

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

@@ -1,9 +1,11 @@
 package com.diagbot.facade;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,11 +52,14 @@ public class InquiryDetailFacade extends InquiryDetailServiceImpl {
      * @return
      */
     public Map<Long, List<InquiryDetail>> getDetailsByInquryIds(List<Long> inquiryIds) {
-        QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("inquiry_id", inquiryIds);
-        List<InquiryDetail> inquiryDetails = this.list(queryWrapper);
-        return inquiryDetails.stream().collect(Collectors.groupingBy(InquiryDetail::getInquiryId));
+        if (ListUtil.isNotEmpty(inquiryIds)){
+            QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
+            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("inquiry_id", inquiryIds);
+            List<InquiryDetail> inquiryDetails = this.list(queryWrapper);
+            return inquiryDetails.stream().collect(Collectors.groupingBy(InquiryDetail::getInquiryId));
+        }
+        return new HashMap<>();
     }
 
 

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

@@ -46,7 +46,7 @@ public class LisExcelResFacade {
     TranServiceClient tranServiceClient;
 
     @SuppressWarnings("null")
-	public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
+    public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
 
         List<String> messages = new ArrayList<>();
         List<LisExcelWrapperVO> lisExcelWrapperList = new ArrayList<>();
@@ -110,15 +110,15 @@ public class LisExcelResFacade {
                                     }
                                     LisExcelWrapperVO lisExcelWrapper = new LisExcelWrapperVO();
 
-                                    
+
                                     lisExcelWrapper.setMealName(mealName);
                                     lisExcelWrapper.setItemName(itemName);
-                                    String assembly = mealName+"--";
-                                    if (!assemblys.contains(assembly)){
+                                    String assembly = mealName + "--";
+                                    if (!assemblys.contains(assembly)) {
                                         assemblys.add(assembly);
                                     }
-                                    assembly = mealName+"--"+itemName;
-                                    if (!assemblys.contains(assembly)){
+                                    assembly = mealName + "--" + itemName;
+                                    if (!assemblys.contains(assembly)) {
                                         assemblys.add(assembly);
                                     }
                                     //  lisExcelWrapper.setUniqueName(uniqueName);
@@ -167,12 +167,12 @@ public class LisExcelResFacade {
                         .collect(Collectors.toMap(LisConfigDTO::getAssembly, LisConfigDTO::getUniqueName));
                 List<LisExcelWrapperVO> lisExcelWrapperListNew = new ArrayList<>();
                 for (LisExcelWrapperVO lisExcelWrapperNew : lisExcelWrapperList) {
-                    String assemblymeal = lisExcelWrapperNew.getMealName()+"--";
-                    if(null != listMap.get(assemblymeal)){
+                    String assemblymeal = lisExcelWrapperNew.getMealName() + "--";
+                    if (null != listMap.get(assemblymeal)) {
                         lisExcelWrapperNew.setUniquemealName(listMap.get(assemblymeal));
                     }
-                    String item = lisExcelWrapperNew.getMealName()+"--"+lisExcelWrapperNew.getItemName();
-                    if(null != listMap.get(item)){
+                    String item = lisExcelWrapperNew.getMealName() + "--" + lisExcelWrapperNew.getItemName();
+                    if (null != listMap.get(item)) {
                         lisExcelWrapperNew.setUniqueName(listMap.get(item));
                     }
                     lisExcelWrapperListNew.add(lisExcelWrapperNew);

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/PushFacade.java

@@ -344,13 +344,19 @@ public class PushFacade {
      */
     public List<ConceptPushDTO> addQuestionId(List<ConceptPushDTO> concepts, Integer type) {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("type", type).ne("tag_type", TagTypeEnum.T8.getKey());
+        List<String> nameList = concepts.stream()
+                .map(concept -> concept.getName())
+                .collect(Collectors.toList());
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("type", type)
+                .ne("tag_type", TagTypeEnum.T8.getKey());
         //化验填写单匹配name
-        if (type.equals(ConceptTypeEnum.Lis.getKey())) {
-            questionInfoQueryWrapper.in("name", nameList);
-        } else {
-            questionInfoQueryWrapper.in("tag_name", nameList);
+        if (ListUtil.isNotEmpty(nameList)) {
+            if (type.equals(ConceptTypeEnum.Lis.getKey())) {
+                questionInfoQueryWrapper.in("name", nameList);
+            } else {
+                questionInfoQueryWrapper.in("tag_name", nameList);
+            }
         }
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         if (ListUtil.isNotEmpty(questionInfoList)) {

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

@@ -86,11 +86,15 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      * @return
      */
     public Map<Long, QuestionInfo> getQuestionInfos(List<Long> questionIdList) {
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        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 = new HashMap<>();
+        if (ListUtil.isNotEmpty(questionIdList)) {
+            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("id", questionIdList);
+            List<QuestionInfo> questionInfoList = this.list(questionInfoQueryWrapper);
+            map = questionInfoList.stream()
+                    .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+        }
         return map;
     }
 
@@ -133,11 +137,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 +194,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) {
@@ -222,11 +230,14 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      * @return
      */
     public Map<Long, List<QuestionDetail>> getQuestionDetailWithMap(List<Long> questionIds) {
-        List<QuestionDetail> detailList = questionDetailFacade.list(new QueryWrapper<QuestionDetail>()
-                .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 = new HashMap<>();
+        if (ListUtil.isNotEmpty(questionIds)) {
+            List<QuestionDetail> detailList = questionDetailFacade.list(new QueryWrapper<QuestionDetail>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("question_id", questionIds)
+                    .orderByAsc("order_no"));
+            detailMap = EntityUtil.makeEntityListMap(detailList, "questionId");
+        }
         return detailMap;
     }
 

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -61,14 +62,19 @@ public class RetrievalFacade {
                     questionNames.add(conceptRetrievalDTO.getParentName());
                 }
             }
-            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("tag_name", questionNames)
-                    .eq("type", retrievalVO.getType())
-                    .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 = new HashMap<>();
+            if (ListUtil.isNotEmpty(questionNames)){
+                QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+                questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("tag_name", questionNames)
+                        .eq("type", retrievalVO.getType())
+                        .ne("tag_type", 8)
+                        .eq("item_type", 0);
+                List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
+                questionInfoMap = questionInfoList.stream()
+                        .collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
+            }
             RetrievalDTO retrievalDTO = new RetrievalDTO();
             //封装
             for (ConceptRetrievalDTO conceptRetrievalDTO : conceptInfos.data) {
@@ -76,14 +82,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 +105,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 +123,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 +135,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());
                 }
             }
@@ -145,9 +151,10 @@ public class RetrievalFacade {
                     .ne("tag_type", 8)
                     .in("type", typeList);
             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));
             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/facade/TemplateInfoFacade.java

@@ -1,13 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,7 +10,6 @@ import com.diagbot.entity.TemplateInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.TemplateInfoService;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
@@ -30,6 +21,12 @@ import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author wangfeng
@@ -75,7 +72,8 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
     public boolean updateByIdUsName(TemplateInfoRevampVO templateInfoRevampVO) {
         //1.先判断数据是否存在有效
         QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
-        templateInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+        templateInfoFand
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", templateInfoRevampVO.getId());
         int sum = count(templateInfoFand);
         if (sum == 0) {
@@ -164,9 +162,14 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         //System.out.println(substring);
         //3.以逗号分割
         String[] splitIds = substring.split(",");
+        //验证转化好的参数
+        if (ListUtil.isEmpty(ListUtil.arrayToList(splitIds))) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入模板id");
+        }
         //把分割的id数据传入对象中，在表中批量删除
         UpdateWrapper<TemplateInfo> templateInfoNew = new UpdateWrapper<>();
-        templateInfoNew.in("id", ListUtil.arrayToList(splitIds))
+        templateInfoNew
+                .in("id", ListUtil.arrayToList(splitIds))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 //.set("modifier",UserUtils.getCurrentPrincipleID())
@@ -177,52 +180,30 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
     }
 
     /**
-     * 
      * @param page
      * @param templateInfoPageVO
      * @return
      */
-	public IPage<TemplateInfoPageDTO> getTemplatePageAlls(Page page, TemplateInfoPageVO templateInfoPageVO) {
-/*		  //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+    public IPage<TemplateInfoPageDTO> getTemplatePageAlls(Page page, TemplateInfoPageVO templateInfoPageVO) {
+        IPage<TemplateInfoPageDTO> TemplateInfoData = getTemplatePages(templateInfoPageVO);
+        return TemplateInfoData;
+    }
 
+    /**
+     * @param templateIdVO
+     * @return
+     */
+    public TemplateInfoDTO getTemplateIdAlls(TemplateIdVO templateIdVO) {
+        //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
         QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
-        Map<String, Object> mapAll = new HashMap<>();
-        mapAll.put("hospital_dept_id", templateInfoPageVO.getHospitalDeptId());
-        mapAll.put("doctor_id", templateInfoPageVO.getDoctorId());
-        mapAll.put("hospital_id", templateInfoPageVO.getHospitalId());
-        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
-        mapAll.put("type", templateInfoPageVO.getType());
-        if (templateInfoPageVO.getSex() != null) {
-            templateInfoQuery.allEq(mapAll).in("sex", 3, templateInfoPageVO.getSex()).orderByDesc("gmt_create");
-        } else {
-            templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
-        }
-        IPage<TemplateInfoPageDTO> TemplateInfoData =page(page, templateInfoQuery);
-        List<TemplateInfoPageDTO> datas = TemplateInfoData.getRecords();
-        List<TemplateInfoPageDTO> data = new ArrayList<TemplateInfoPageDTO>();
-        //过滤
-        data = BeanUtil.listCopyTo(datas, TemplateInfoPageDTO.class);
-        
-		return TemplateInfoData.setRecords(data);*/
-		IPage<TemplateInfoPageDTO> TemplateInfoData = getTemplatePages(templateInfoPageVO);
-		return TemplateInfoData;
-	}
-
-	/**
-	 * 
-	 * @param templateIdVO
-	 * @return
-	 */
-	public TemplateInfoDTO getTemplateIdAlls(TemplateIdVO templateIdVO) {
-		 //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
-        QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
-        templateInfoQuery.eq("id", templateIdVO.getId())
-        .eq("is_deleted", IsDeleteEnum.N.getKey());    
+        templateInfoQuery
+                .eq("id", templateIdVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
         TemplateInfoDTO data = new TemplateInfoDTO();
         TemplateInfo datas = getOne(templateInfoQuery, false);
         //过滤
         BeanUtil.copyProperties(datas, data);
         return data;
-	}
+    }
 
 }

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/DisclaimerInformationController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.RespDTO;
@@ -14,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-
 /**
  * @author wangfeng
  * @Description: 免责申明详情 前端控制器

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

@@ -42,7 +42,8 @@ public class DoctorPageModeController {
     @Autowired
     DoctorPageModeFacade doctorPageModeFacade;
 
-    @ApiOperation(value = "保存医生页面结构设置信息[by:wangfeng]", notes = "医生id : doctorId;</br>模式分类: modeClassify;</br> 模式值: modeValue;")
+    @ApiOperation(value = "保存医生页面结构设置信息[by:wangfeng]",
+            notes = "医生id : doctorId;</br>模式分类: modeClassify;</br> 模式值: modeValue;")
     @PostMapping("/saveDoctorPageModes")
     @SysLogger("saveDoctorPageModes")
     @Transactional

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

@@ -35,14 +35,19 @@ public class IndexDataController {
     @Autowired
     IndexDataFacade indexDataFacade;
 
-    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]",
+                  notes = "diseaseName：疾病名 必填<br> patientId:患者id ,必填<br> " +
+                          "startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
         return RespDTO.onSuc(indexDataFacade.getIndexDataAll(indexDataFindVO));
     }
 
-    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> doctorId：医生id必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]",
+                  notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> doctorId：" +
+                          "医生id必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;" +
+                          "指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
     @PostMapping("/saveIndexDatas")
     @SysLogger("saveIndexDatas")
     @Transactional

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

@@ -30,7 +30,8 @@ public class LisExcelResController {
 
     @ApiOperation(value = "导入化验数据:[by:wangfeng]", notes = "导入化验数据")
     @PostMapping(value = "/lisExcelAnalysis", produces="text/html;charset=utf-8")
-    public String lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
+    public String lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO,
+                                   HttpServletRequest request) {
         return GsonUtil.toJson(lisExcelResFacade.lisExcelAnalysis(file,lisHospitalCodeVO, request));
     }
 }

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

@@ -29,9 +29,12 @@ public class PrintRecordController {
     @Autowired
     PrintRecordFacade printRecordFacade;
 
-    @ApiOperation(value = "保存打印记录[by:wangfeng]", notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>"
-            + "患者id:patientId</br>"
-            + "医院部门id:hospitalDeptId</br> 问诊号:inquiryCode</br>文本内容 :content </br>{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>dataJson:内容JSON字符串(打印页面展示)")
+    @ApiOperation(value = "保存打印记录[by:wangfeng]",
+                  notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>" +
+                          "患者id:patientId</br>" +
+                          "医院部门id:hospitalDeptId</br> 问诊号:inquiryCode</br>文本内容 :content </br>" +
+                          "{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>" +
+                          "dataJson:内容JSON字符串(打印页面展示)")
     @PostMapping("/savePrintRecords")
     @SysLogger("savePrintRecords")
     @Transactional

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

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

@@ -63,9 +63,11 @@ public class TemplateInfoController {
     }
 
 
-    @ApiOperation(value = "保存病历模板[by:wangfeng]", notes = "modeName;//模板名字</br>"
-            + "doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>"
-            + "modeType;//模板类型</br>preview;//预览文本</br>{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>dataJson;//模板数据</br>")
+    @ApiOperation(value = "保存病历模板[by:wangfeng]", notes = "modeName;//模板名字</br>"+
+             "doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>"+
+             "modeType;//模板类型</br>preview;//预览文本</br>" +
+             "{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>" +
+             "dataJson;//模板数据</br>")
     @PostMapping("/saveTemplateInfo")
     @SysLogger("saveTemplateInfo")
     @Transactional

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

@@ -84,7 +84,10 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
 
         //查找标签是否存在
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        List<Long> vitalIds = deptVitalVO.getDvDetailVOList().stream().map(deDetailVO -> deDetailVO.getVitalId()).collect(Collectors.toList());
+        List<Long> vitalIds = deptVitalVO.getDvDetailVOList()
+                .stream()
+                .map(deDetailVO -> deDetailVO.getVitalId())
+                .collect(Collectors.toList());
         questionInfoQueryWrapper.in("id", vitalIds).
                 eq("type", QuestionTypeEnum.Vital.getKey()).
                 eq("is_deleted", IsDeleteEnum.N.getKey());

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/ModuleDetailFacade.java

@@ -34,8 +34,6 @@ import java.util.stream.Collectors;
 @Component
 public class ModuleDetailFacade extends ModuleDetailServiceImpl {
 
-    @Autowired
-    private ModuleInfoFacade moduleInfoFacade;
     @Autowired
     @Qualifier("moduleDetailServiceImpl")
     private ModuleDetailService moduleDetailService;
@@ -90,17 +88,23 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
                 textList.add(addModuleDetailVO.getText());
             }
         }
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_type", TagTypeEnum.T8.getKey())
-                .eq("type", addModuleInfoVO.getTextType())
-                .in("name", textList);
-        List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
+
         //将标签id放入map
         Map<String, Long> questionIdMap = new HashMap<>();
-        for (AddModuleDetailVO addModuleDetailVO : addModuleInfoVO.getModelDetils()) {
-            if (StringUtil.isNotEmpty(addModuleDetailVO.getText())) {
-                questionIdMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo.getId()));
+        if (ListUtil.isNotEmpty(textList)){
+            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("tag_type", TagTypeEnum.T8.getKey())
+                    .eq("type", addModuleInfoVO.getTextType())
+                    .in("name", textList);
+            List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
+
+            for (AddModuleDetailVO addModuleDetailVO : addModuleInfoVO.getModelDetils()) {
+                if (StringUtil.isNotEmpty(addModuleDetailVO.getText())) {
+                    questionIdMap = questionInfoList.stream()
+                            .collect(Collectors.toMap(QuestionInfo::getTagName,
+                                    questionInfo -> questionInfo.getId()));
+                }
             }
         }
         QuestionInfo addquestionInfo = null;
@@ -132,7 +136,7 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
         questionInfoService.saveBatch(addQuestionInfoList);
         //查询自定义标签的id
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper1 = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+        questionInfoQueryWrapper1.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("type", addModuleInfoVO.getTextType())
                 .eq("tag_type", TagTypeEnum.T8.getKey());
         List<QuestionInfo> questionInfoList1 = questionFacade.list(questionInfoQueryWrapper1);

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(ListUtil.isNotEmpty(types), "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/enums/ConceptTypeEnum.java

@@ -20,14 +20,13 @@ public enum ConceptTypeEnum implements KeyedNamed {
     Drug_Category_Big(9, "药品分类-大类"),
     SIDE_EFFECTS(10, "不良反应"),
     Drug_Category_Small(11, "药品分类-小类"),
-    LIS_TABLES(12,"化验公表项"),
-    DEPARTMENT(15,"科室"),
+    LIS_TABLES(12, "化验公表项"),
+    DEPARTMENT(15, "科室"),
     Scale(21, "量表"),
     Indication(22, "指标"),
     LisDetail(51, "化验明细");
 
 
-
     @Setter
     private Integer key;
 

knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseFeatureTypeEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description:
  * @date 2018年11月21日 下午2:31:42

knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseFieldEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description:
  * @date 2018年11月21日 下午2:31:42

knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseTypeEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description:
  * @date 2018年11月21日 下午2:31:42

knowledgeman-service/src/main/java/com/diagbot/enums/DisclaimerCodeEnum.java

@@ -3,13 +3,13 @@ package com.diagbot.enums;
 import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
-public enum DisclaimerCodeEnum implements KeyedNamed{
-	
-	DiagnoseDisclaimer(1, "诊断免责信息"),
-	PushLiability(2, "推送免责信息"),
-	Disclaimer(3,"免责声明");
-	
-	@Setter
+public enum DisclaimerCodeEnum implements KeyedNamed {
+
+    DiagnoseDisclaimer(1, "诊断免责信息"),
+    PushLiability(2, "推送免责信息"),
+    Disclaimer(3, "免责声明");
+
+    @Setter
     private Integer key;
 
     @Setter
@@ -30,7 +30,7 @@ public enum DisclaimerCodeEnum implements KeyedNamed{
     }
 
     public static String getName(Integer key) {
-    	DisclaimerCodeEnum item = getEnum(key);
+        DisclaimerCodeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
 

knowledgeman-service/src/main/java/com/diagbot/enums/DiseaseClassifyEnum.java

@@ -3,12 +3,12 @@ package com.diagbot.enums;
 import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
-public enum DiseaseClassifyEnum implements KeyedNamed{
-	
-	LevelFirst(1, "Ⅰ"),
-	LevelSecond(2, "Ⅱ");
-	
-	@Setter
+public enum DiseaseClassifyEnum implements KeyedNamed {
+
+    LevelFirst(1, "Ⅰ"),
+    LevelSecond(2, "Ⅱ");
+
+    @Setter
     private Integer key;
 
     @Setter
@@ -29,7 +29,7 @@ public enum DiseaseClassifyEnum implements KeyedNamed{
     }
 
     public static String getName(Integer key) {
-    	DiseaseClassifyEnum item = getEnum(key);
+        DiseaseClassifyEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
 

knowledgeman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description:
  * @date 2018年11月21日 下午2:31:42

knowledgeman-service/src/main/java/com/diagbot/enums/LexiconRSTypeEnum.java

@@ -9,25 +9,25 @@ import lombok.Setter;
  * @time: 2019/5/6 13:58
  */
 public enum LexiconRSTypeEnum implements KeyedNamed {
-    IS_A(1,"是"),
-    EQUAL_TO(2,"同义于"),
-    INCLUDE_OF(3,"包含于"),
-    ASSOCIATED_WITH(4,"与相关"),
-    CAUSE(5,"引起"),
-    LOCATED_AT(6,"位于"),
-    AKA(7,"别名"),
-    INSURE_LEVEL(8,"医保"),
-    APPLIED_TO(9,"适用于"),
-    PREFERRED_MEDS(10,"首选药物"),
-    TREAT(11,"治疗"),
-    USAGE(12,"用法"),
-    REACTION(13,"不良反应"),
-    DO_AND_DONOT(14,"注意事项"),
-    SPEC(15,"规格"),
-    HAS(16,"有"),
-    ORDER_BY(17,"包含排列于"),
-    SUBITEM(18,"包含子项"),
-    PUSH(19,"推送");
+    IS_A(1, "是"),
+    EQUAL_TO(2, "同义于"),
+    INCLUDE_OF(3, "包含于"),
+    ASSOCIATED_WITH(4, "与相关"),
+    CAUSE(5, "引起"),
+    LOCATED_AT(6, "位于"),
+    AKA(7, "别名"),
+    INSURE_LEVEL(8, "医保"),
+    APPLIED_TO(9, "适用于"),
+    PREFERRED_MEDS(10, "首选药物"),
+    TREAT(11, "治疗"),
+    USAGE(12, "用法"),
+    REACTION(13, "不良反应"),
+    DO_AND_DONOT(14, "注意事项"),
+    SPEC(15, "规格"),
+    HAS(16, "有"),
+    ORDER_BY(17, "包含排列于"),
+    SUBITEM(18, "包含子项"),
+    PUSH(19, "推送");
 
     @Setter
     private Integer key;

knowledgeman-service/src/main/java/com/diagbot/enums/LexiconTypeEnum.java

@@ -9,77 +9,77 @@ import lombok.Setter;
  * @time: 2019/5/6 13:58
  */
 public enum LexiconTypeEnum implements KeyedNamed {
-    SYMPTOM(1,"症状"),
-    TIME(2,"时间"),
-    BODYPART(3,"部位"),
-    NATURE(4,"性质"),
-    CAUSE(5,"诱因"),
-    DEGREE(6,"程度"),
-    NEGATIVE(7,"阴性"),
-    POSITIVE(8,"阳性"),
-    COMPANY(9,"单位"),
-    DRUGS(10,"药品通用名"),
-    TREATMENT(11,"治疗"),
-    LIS_PACKAGE(12,"化验套餐"),
-    LIS_DETAILS(13,"化验明细"),
-    LIS_RESULTS(14,"化验结果"),
-    PACS_PACKAGE(15,"辅检套餐"),
-    PACS_ITEMS(16,"辅检项目"),
-    PACS_RESULTS(17,"辅检结果"),
-    DIAGNOSIS(18,"诊断"),
-    CONNECTIVES(19,"连接词"),
-    POSITION(20,"方位"),
-    RELATIVES(21,"亲属"),
-    MARRIAGE(22,"婚姻"),
-    FOOD(23,"食品"),
-    HISTORY(24,"历史"),
-    OPERATION(25,"手术"),
-    SYMPTOM_MANIFESTATION(26,"症状表现"),
-    DIGITAL_QUANTIFIER(27,"数字量词"),
-    NUMBER(28,"数字"),
-    DRUG_CATEGORY_BIG(29,"药品大类"),
-    DRUG_CATEGORY_SMALL(30,"药品小类"),
-    PACS_CATEGORY_BIG(31,"辅检大类"),
-    PACS_CATEGORY_SMALL(32,"辅检小类"),
-    VITAL_INDEX(33,"体征指标"),
-    VITAL_INDEX_VALUE(34,"体征指标值"),
-    VITAL_RESULT(35,"体征结果"),
-    PLACE(36,"地点"),
-    OCCUPATION(37,"职业"),
-    PERSONAL_HISTORY(38,"个人史"),
-    PERSONAL_HISTORY_DESCRIPTION(39,"个人史描述"),
-    TIME_DESCRIPTION(40,"时间描述"),
-    SYMPTOM_INDEX(41,"症状指标"),
-    MEDICAL_SUPPLIES(42,"医用耗材"),
-    DEGREE_CLASSIFIER(43,"程度量词"),
-    OTHER(44,"其他"),
-    DELETE(45,"删除"),
-    LIS_TABLES(46,"化验公表项"),
-    DEPARTMENT(47,"科室"),
-    GAUGE(48,"量表"),
-    SIDE_EFFECTS(49,"不良反应"),
-    CORE_INDICATORS(50,"核心指标"),
-    TYPES_OF_DISEASE(51,"疾病类型(慢病|急诊)"),
-    PART_AREA(52,"部位区域"),
-    LOCATION_AREA(52,"部位区域"),
-    CHEMICAL_NAME_OF_DRUG(53,"药品化学名"),
-    DRUG_TRADE_NAMES(54,"药品商品名"),
-    HISTORY_OF_PAST_DISEASES(55,"既往疾病史"),
-    HISTORY_OF_TRAUMA(56,"外伤史"),
-    HISTORY_OF_SURGERY(57,"手术史"),
-    HISTORY_OF_BLOOD_TRANSFUSION(58,"输血史"),
-    INFECTIOUS_DISEASE_HISTORY(59,"传染病史"),
-    BAD_HABITS(60,"不良习惯"),
-    MARITAL_HISTORY(61,"冶游史"),
-    HISTORY_OF_MARRIAGE_AND_CHILDBEARING(62,"婚育史"),
-    BIRTH_HISTORY(63,"生育史"),
-    FAMILY_HISTORY(64,"家族史"),
-    FOOD_ALLERGY_HISTORY(65,"食物过敏史"),
-    HISTORY_OF_DRUG_ALLERGY(66,"药物过敏史"),
-    FAMILY_RELATED_INFECTIOUS_DISEASE_HISTORY(67,"家族相关传染病史"),
-    FURTHER_CONSULTATION(68,"复诊"),
-    DIAGNOSTIC_CRITERIA(69,"诊断依据条件"),
-    OTHER_DIAGNOSTIC_CRITERIA(70,"诊断依据其他");
+    SYMPTOM(1, "症状"),
+    TIME(2, "时间"),
+    BODYPART(3, "部位"),
+    NATURE(4, "性质"),
+    CAUSE(5, "诱因"),
+    DEGREE(6, "程度"),
+    NEGATIVE(7, "阴性"),
+    POSITIVE(8, "阳性"),
+    COMPANY(9, "单位"),
+    DRUGS(10, "药品通用名"),
+    TREATMENT(11, "治疗"),
+    LIS_PACKAGE(12, "化验套餐"),
+    LIS_DETAILS(13, "化验明细"),
+    LIS_RESULTS(14, "化验结果"),
+    PACS_PACKAGE(15, "辅检套餐"),
+    PACS_ITEMS(16, "辅检项目"),
+    PACS_RESULTS(17, "辅检结果"),
+    DIAGNOSIS(18, "诊断"),
+    CONNECTIVES(19, "连接词"),
+    POSITION(20, "方位"),
+    RELATIVES(21, "亲属"),
+    MARRIAGE(22, "婚姻"),
+    FOOD(23, "食品"),
+    HISTORY(24, "历史"),
+    OPERATION(25, "手术"),
+    SYMPTOM_MANIFESTATION(26, "症状表现"),
+    DIGITAL_QUANTIFIER(27, "数字量词"),
+    NUMBER(28, "数字"),
+    DRUG_CATEGORY_BIG(29, "药品大类"),
+    DRUG_CATEGORY_SMALL(30, "药品小类"),
+    PACS_CATEGORY_BIG(31, "辅检大类"),
+    PACS_CATEGORY_SMALL(32, "辅检小类"),
+    VITAL_INDEX(33, "体征指标"),
+    VITAL_INDEX_VALUE(34, "体征指标值"),
+    VITAL_RESULT(35, "体征结果"),
+    PLACE(36, "地点"),
+    OCCUPATION(37, "职业"),
+    PERSONAL_HISTORY(38, "个人史"),
+    PERSONAL_HISTORY_DESCRIPTION(39, "个人史描述"),
+    TIME_DESCRIPTION(40, "时间描述"),
+    SYMPTOM_INDEX(41, "症状指标"),
+    MEDICAL_SUPPLIES(42, "医用耗材"),
+    DEGREE_CLASSIFIER(43, "程度量词"),
+    OTHER(44, "其他"),
+    DELETE(45, "删除"),
+    LIS_TABLES(46, "化验公表项"),
+    DEPARTMENT(47, "科室"),
+    GAUGE(48, "量表"),
+    SIDE_EFFECTS(49, "不良反应"),
+    CORE_INDICATORS(50, "核心指标"),
+    TYPES_OF_DISEASE(51, "疾病类型(慢病|急诊)"),
+    PART_AREA(52, "部位区域"),
+    LOCATION_AREA(52, "部位区域"),
+    CHEMICAL_NAME_OF_DRUG(53, "药品化学名"),
+    DRUG_TRADE_NAMES(54, "药品商品名"),
+    HISTORY_OF_PAST_DISEASES(55, "既往疾病史"),
+    HISTORY_OF_TRAUMA(56, "外伤史"),
+    HISTORY_OF_SURGERY(57, "手术史"),
+    HISTORY_OF_BLOOD_TRANSFUSION(58, "输血史"),
+    INFECTIOUS_DISEASE_HISTORY(59, "传染病史"),
+    BAD_HABITS(60, "不良习惯"),
+    MARITAL_HISTORY(61, "冶游史"),
+    HISTORY_OF_MARRIAGE_AND_CHILDBEARING(62, "婚育史"),
+    BIRTH_HISTORY(63, "生育史"),
+    FAMILY_HISTORY(64, "家族史"),
+    FOOD_ALLERGY_HISTORY(65, "食物过敏史"),
+    HISTORY_OF_DRUG_ALLERGY(66, "药物过敏史"),
+    FAMILY_RELATED_INFECTIOUS_DISEASE_HISTORY(67, "家族相关传染病史"),
+    FURTHER_CONSULTATION(68, "复诊"),
+    DIAGNOSTIC_CRITERIA(69, "诊断依据条件"),
+    OTHER_DIAGNOSTIC_CRITERIA(70, "诊断依据其他");
 
 
     @Setter
@@ -101,7 +101,7 @@ public enum LexiconTypeEnum implements KeyedNamed {
         }
         return null;
     }
-    
+
     public static LexiconTypeEnum getEnum(String name) {
         for (LexiconTypeEnum item : LexiconTypeEnum.values()) {
             if (item.name.equals(name)) {
@@ -115,7 +115,7 @@ public enum LexiconTypeEnum implements KeyedNamed {
         LexiconTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
-    
+
     public static Integer getKey(String name) {
         LexiconTypeEnum item = getEnum(name);
         return item != null ? item.key : null;

knowledgeman-service/src/main/java/com/diagbot/enums/RelationModelTypeEnum.java

@@ -9,10 +9,10 @@ import lombok.Setter;
  * @time: 2019/5/7 14:06
  */
 public enum RelationModelTypeEnum implements KeyedNamed {
-    KSCY(471011,"科室常用"),
-    HYCY(4710112,"化验常用"),
-    FJCY(4710116,"辅检常用"),
-    ZDGLLB(1810148,"诊断关联量表");
+    KSCY(471011, "科室常用"),
+    HYCY(4710112, "化验常用"),
+    FJCY(4710116, "辅检常用"),
+    ZDGLLB(1810148, "诊断关联量表");
 
     @Setter
     private Integer key;

knowledgeman-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午2:31:42

knowledgeman-service/src/main/java/com/diagbot/enums/TermEnum.java

@@ -4,53 +4,53 @@ import com.diagbot.core.KeyedNamed;
 
 import lombok.Setter;
 
-public enum TermEnum implements KeyedNamed{
-
-	    Dis(0,"诊断"),
-	    Symptom(1, "症状"),
-	    Vital(2, "体征结果"),
-	    LisMax(3, "化验大项"),
-	    LisMin(4, "化验小项"),
-	    LisRes(5, "化验结果"),
-	    Pacs(6, "辅检项目"),
-	    PacsRes(7, "辅检结果"),
-	    Antidiastole(8, "诊断"),
-	    Cause(9, "诱因"),
-	    AntidiastoleOther(10, "诊断依据其他");
-
-
-	    @Setter
-	    private Integer key;
-
-	    @Setter
-	    private String name;
-
-	    TermEnum(Integer key, String name) {
-	        this.key = key;
-	        this.name = name;
-	    }
-
-	    public static TermEnum getEnum(Integer key) {
-	        for (TermEnum item : TermEnum.values()) {
-	            if (item.key == key) {
-	                return item;
-	            }
-	        }
-	        return null;
-	    }
-
-	    public static String getName(Integer key) {
-	    	TermEnum item = getEnum(key);
-	        return item != null ? item.name : null;
-	    }
-
-	    @Override
-	    public int getKey() {
-	        return key;
-	    }
-
-	    @Override
-	    public String getName() {
-	        return name;
-	    }
+public enum TermEnum implements KeyedNamed {
+
+    Dis(0, "诊断"),
+    Symptom(1, "症状"),
+    Vital(2, "体征结果"),
+    LisMax(3, "化验大项"),
+    LisMin(4, "化验小项"),
+    LisRes(5, "化验结果"),
+    Pacs(6, "辅检项目"),
+    PacsRes(7, "辅检结果"),
+    Antidiastole(8, "诊断"),
+    Cause(9, "诱因"),
+    AntidiastoleOther(10, "诊断依据其他");
+
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    TermEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static TermEnum getEnum(Integer key) {
+        for (TermEnum item : TermEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        TermEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
 }

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

@@ -65,7 +65,7 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
             ipage.getRecords().forEach(i -> {
                 i.setModifier(respDTO.data.get(i.getModifier()));
                 i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
-                i.setNameType(i.getLibName()+"("+LexiconTypeEnum.getName(i.getTypeId().intValue())+")");
+                i.setNameType(i.getLibName() + "(" + LexiconTypeEnum.getName(i.getTypeId().intValue()) + ")");
             });
         }
         return ipage;
@@ -123,7 +123,7 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         }
 
         //  新增明细信息
-		String currentUser = UserUtils.getCurrentPrincipleID();
+        String currentUser = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
         List<ConceptDetail> list = new ArrayList<>();
         for (AddConceptDetailVO detailVO : addConceptDetailVOList) {
@@ -154,11 +154,11 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
      * @return
      */
     public List<ConceptIndexDTO> indexFac(ConceptIndexVO conceptIndexVO) {
-    	List<ConceptIndexDTO> retList = this.index(conceptIndexVO);
-    	retList.forEach(i->{
-    		i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
-    		i.setNameType(i.getName()+"("+LexiconTypeEnum.getName(i.getTypeId().intValue())+")");
-    	});
+        List<ConceptIndexDTO> retList = this.index(conceptIndexVO);
+        retList.forEach(i -> {
+            i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
+            i.setNameType(i.getName() + "(" + LexiconTypeEnum.getName(i.getTypeId().intValue()) + ")");
+        });
         return retList;
     }
 

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

@@ -1242,7 +1242,7 @@ public class ConceptFacade extends ConceptServiceImpl {
     private List<ConceptBaseDTO> getConceptByType(Integer libType) {
         QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
         conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("lib_Type", libType);
+                .eq("lib_Type", libType);
         List<Concept> list = this.list(conceptQueryWrapper);
         List<ConceptBaseDTO> res = ListUtil.newArrayList();
         if (ListUtil.isNotEmpty(list)) {

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

@@ -184,7 +184,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                         .eq("type_id", 18)
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("is_concept", 1)
-                        .notIn("name", disName)
+                        .notIn(ListUtil.isNotEmpty(disName), "name", disName)
         ).getRecords();
         List<Diagnose> diagnoseData = new ArrayList<>();
         for (LibraryInfo diagnose : diagnoses) {
@@ -362,7 +362,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 int j = 0;
                 if (ListUtil.isNotEmpty(detail)) {
                     // 判断诊断名称是否在词库中
-                    flag = verifyExist(libSet, detail.get(0).getDisName(), Arrays.asList(LexiconTypeEnum.DIAGNOSIS.getKey()));
+                    flag = verifyExist(libSet, detail.get(0).getDisName(),
+                            Arrays.asList(LexiconTypeEnum.DIAGNOSIS.getKey()));
                     if (!flag) {
                         DiagnoseQuestion diagnoseQuestion1 = createDiagnoseQuestion(detail.get(0).getDiagnoseId(),
                                 detail.get(0).getDisName(), DiagnoseFeatureTypeEnum.Dis.getKey(),
@@ -453,12 +454,12 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
                                         DiagnoseFieldEnum.relation.getKey());
                                 for (String s : arr) {
+                                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.relation.getKey());
                                     flag = verifyExist(libSet, s.trim(), typeList);
                                     if (!flag) {
                                         sb.append(s).append("、");
-                                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(),
-                                                bean.getDisName(), bean.getType(), s.trim(),
-                                                DiagnoseFieldEnum.relation.getKey(), param, ++j);
+                                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
+                                                s.trim(), DiagnoseFieldEnum.relation.getKey(), param, ++j);
                                         if (addDiagnoseQuestion(diagnosetQuestionSet, diagnoseQuestion)) {
                                             diagnoseQuestionList.add(diagnoseQuestion);
                                         }
@@ -504,6 +505,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
                                         DiagnoseFieldEnum.result.getKey());
                                 for (String s : arr) {
+                                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.result.getKey());
                                     flag = verifyExist(libSet, s.trim(), typeList);
                                     if (!flag) {
                                         sb.append(s).append("、");
@@ -667,7 +669,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
 
             // 校验标准词
             if (StringUtil.isNotEmpty(bean.getStandard())) {
-                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.standard.getKey());
+                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
+                        DiagnoseFieldEnum.standard.getKey());
                 flag = verifyExist(set, bean.getStandard(), typeList);
                 if (!flag) {
                     diagnoseDetail.setVerifyStandard(bean.getStandard());
@@ -687,6 +690,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
                         DiagnoseFieldEnum.relation.getKey());
                 for (String s : arr) {
+                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.relation.getKey());
                     flag = verifyExist(set, s.trim(), typeList);
                     if (!flag) {
                         sb.append(s).append("、");
@@ -713,6 +717,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
                         DiagnoseFieldEnum.result.getKey());
                 for (String s : arr) {
+                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.result.getKey());
                     flag = verifyExist(set, s.trim(), typeList);
                     if (!flag) {
                         sb.append(s).append("、");

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

@@ -46,7 +46,6 @@ import com.diagbot.vo.DiagnosticAllExportVO;
 import com.diagbot.vo.DiagnosticBasisExportVO;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年8月8日 下午1:30:53
@@ -54,358 +53,324 @@ import com.diagbot.vo.DiagnosticBasisExportVO;
 @Component
 public class DiagnoseImportFacade {
 
-	@Autowired
-	DiagnoseQuestionService diagnoseQuestionService;
-	@Autowired
-	@Qualifier("diagnoseDetailServiceImpl")
-	DiagnoseDetailService diagnoseDetailService;
-
-	@SuppressWarnings("null")
-	public RespDTO<DiagnoseImportDTO> importDiagnosticBasisAll(MultipartFile file, HttpServletRequest request) {
-
-		List<String> messages = new ArrayList<>();
-		InputStream inputStream = null;
-		DiagnoseImportDTO diagnoseImportDTO = new DiagnoseImportDTO();
-		List<FeatureDTO> featureList = new ArrayList<FeatureDTO>();
-		List<EquationDTO> equationList = new ArrayList<EquationDTO>();
-		List<String> assemblys = new ArrayList<String>();
-		Workbook wb = null;
-		try {
-			if (!file.isEmpty()) {
-				inputStream = file.getInputStream();
-				if (inputStream.available() > 512000) {
-					messages.add("化验文件最大支持500KB！");
-				} else {
-					String fileName = file.getOriginalFilename();
-					if (fileName.lastIndexOf(".") != -1) {
-						String type = fileName.substring(fileName.lastIndexOf("."));
-						if (type.equals(".xls")) {
-							wb = new HSSFWorkbook(inputStream);
-						} else if (type.equals(".xlsx")) {
-							wb = new XSSFWorkbook(inputStream);
-						}
-						if (wb != null) {
-							Sheet sheet = wb.getSheetAt(0);
-							diagnoseImportDTO.setDisName(sheet.getSheetName());
-							int count = 0;
-							String name, code, standardWord, associatedWord, consequence;
-							for (Row row : sheet) {
-								count++;
-								try {
-									if (row != null) {
-										name = getValue(row.getCell(0)).trim().replace(" ", "");
-										code = getValue(row.getCell(1)).trim().replace(" ", "");
-										standardWord = getValue(row.getCell(2)).trim();
-										associatedWord = getValue(row.getCell(3)).trim();
-										consequence = getValue(row.getCell(4)).trim();
-
-									} else {
-										name = null;
-										code = null;
-										standardWord = null;
-										associatedWord = null;
-										consequence = null;
-
-									}
-
-									/*
-									 * if (StringUtil.isEmpty(name) &&
-									 * StringUtil.isEmpty(itemName) &&
-									 * StringUtil.isEmpty(value) &&
-									 * StringUtil.isEmpty(name)) { continue; }
-									 */
-
-									if (count == 1 && !name.equals("类型")) {
-										messages.add("第" + count + "第一行不是类型！");
-										continue;
-									}
-
-									if (StringUtil.isEmpty(name)) {
-										messages.add("第" + count + "行数据不规范,类型必填;");
-										continue;
-									}
-									FeatureDTO feature = new FeatureDTO();
-									EquationDTO equation = new EquationDTO();
-									if (code.trim().equals("")) {
-										equation.setType(name);
-										equation.setAssociated(associatedWord);
-										equationList.add(equation);
-									} else {
-										feature.setType(name);
-										feature.setCode(code);
-										feature.setResult(consequence);
-										feature.setAssociated(associatedWord);
-										feature.setStandard(standardWord);
-										featureList.add(feature);
-
-									}
-
-								} catch (Exception e) {
-									e.printStackTrace();
-									throw new CommonException(CommonErrorCode.NOT_EXISTS, e.toString());
-									// logger.error("",e);
-								}
-							}
-						} else {
-							// throw new
-							// CommonException(CommonErrorCode.NOT_EXISTS,
-							// "非excel文件无法解析！");
-							messages.add("非excel文件无法解析！");
-						}
-					} else {
-						// throw new CommonException(CommonErrorCode.NOT_EXISTS,
-						// "未知文件无法解析！");
-						messages.add("未知文件无法解析！");
-					}
-				}
-			} else {
-				// throw new CommonException(CommonErrorCode.NOT_EXISTS,
-				// "无文件上传！");
-				messages.add("无文件上传！");
-			}
-
-			diagnoseImportDTO.setEquation(equationList);
-			diagnoseImportDTO.setFeature(featureList);
-			diagnoseImportDTO.setMessages(messages);
-			return RespDTO.onSuc(diagnoseImportDTO);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验excel文件解析出错！");
-			// return response.failure("化验excel文件解析出错！");
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-				if (wb != null) {
-					wb.close();
-				}
-			} catch (Exception e) {
-			}
-		}
-	}
-
-	private String getValue(Cell cell) {
-		try {
-			Object obj = null;
-			switch (cell.getCellTypeEnum()) {
-			case BOOLEAN:
-				obj = cell.getBooleanCellValue();
-				break;
-			case ERROR:
-				obj = cell.getErrorCellValue();
-				break;
-			case NUMERIC:
-				if (HSSFDateUtil.isCellDateFormatted(cell)) {
-					Date date = cell.getDateCellValue();
-					obj = DateFormatUtils.format(date, "yyyy-MM-dd");
-				} else {
-					obj = cell.getNumericCellValue();
-					DecimalFormat df = new DecimalFormat();
-					obj = df.format(obj);
-				}
-
-				// obj = cell.getNumericCellValue();
-				break;
-			case STRING:
-				obj = cell.getStringCellValue();
-				break;
-			default:
-				break;
-			}
-			return obj.toString();
-		} catch (Exception e) {
-			return "";
-		}
-	}
-
-	public void exportDiagnosticBasis(DiagnosticBasisExportVO diaExportVO, HttpServletResponse response) {
-		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
-		diaQuery.like("dis_name", diaExportVO.getDisName()).like("question_name", diaExportVO.getQuestion())
-				.like("type", diaExportVO.getType()).eq("is_deleted", IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
-		List<DiagnoseQuestion> datas = diagnoseQuestionService.list(diaQuery);
-
-		GsonUtil.toJson(datas);
-		System.out.println(GsonUtil.toJson(datas));
-		List<String> listName = new ArrayList<>();
-
-		listName.add("归属诊断");
-		listName.add("标准术语*");
-		listName.add("类型*");
-		listName.add("术语同义词*(多个时用\",\"隔开,必须需要包含本体)");
-		listName.add("标准术语说明");
-		listName.add("性别");
-		listName.add("最小年龄");
-		listName.add("最大年龄");
-
-		List<String> listId = new ArrayList<>();
-		listId.add("disName");
-		listId.add("term");
-		listId.add("type");
-		listId.add("termSynonym");
-		listId.add("TermNote");
-		listId.add("sex");
-		listId.add("minAge");
-		listId.add("maxAge");
-
-		List<DiagnosticBasisExportDTO> list = new ArrayList<>();
-		for (int i = 0; i < datas.size(); i++) {
-			DiagnoseQuestion diagnose = datas.get(i);
-			list.add(new DiagnosticBasisExportDTO(diagnose.getDisName(), diagnose.getQuestionName(),
-					getType(diagnose.getType(), diagnose.getQuestionType()), diagnose.getQuestionName(), "", "通用", "0",
-					"200"));
-
-		}
-		response.setContentType("text/html;charset=UTF-8");
-		ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-		ex.exportExcelNew("诊断依据问题词", listName, listId, list, response);
-
-	}
-
-	/**
-	 * 
-	 * @param diaAllExportVO
-	 * @param response
-	 */
-	public void exportDiagnosticAll(DiagnosticAllExportVO diaAllExportVO, HttpServletResponse response) {
-		QueryWrapper<DiagnoseDetail> diaQuery = new QueryWrapper<>();
-		diaQuery.eq("diagnose_id", diaAllExportVO.getDiagnoseId()).eq("is_deleted", IsDeleteEnum.N.getKey());
-		List<DiagnoseDetail> datas = diagnoseDetailService.list(diaQuery);
-
-		GsonUtil.toJson(datas);
-		System.out.println(GsonUtil.toJson(datas));
-		List<String> listName = new ArrayList<>();
-
-		listName.add("类型");
-		listName.add("序号");
-		listName.add("标准词*");
-		listName.add("是否需要病史采集");
-		listName.add("关联词");
-		listName.add("结果");
-
-		List<String> listId = new ArrayList<>();
-		listId.add("type");
-		listId.add("code");
-		listId.add("standard");
-		listId.add("historyTaking");
-		listId.add("relation");
-		listId.add("result");
-
-		
-		String disName =(datas.size()>0)?datas.get(0).getDisName():" ";
-		List<DiagnosticAllExportDTO> list = new ArrayList<>();
-		for (int i = 0; i < datas.size(); i++) {
-			DiagnoseDetail diagnose = datas.get(i);
-			disName = diagnose.getDisName();
-			list.add(new DiagnosticAllExportDTO(getDisType(diagnose.getType()), diagnose.getCode(),
-					diagnose.getStandard(), "", getRelation(diagnose.getType(),diagnose), getResults(diagnose.getType(),diagnose)));
-
-		}
-		response.setContentType("text/html;charset=UTF-8");
-		ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-		ex.exportExcelNew(disName, listName, listId, list, response);
-
-	}
-
-	/**
-	 * 导出类型转换
-	 * 
-	 * @param type
-	 * @param questionType
-	 * @return
-	 */
-	public String getType(Integer type, Integer questionType) {
-		String typeName = "";
-		if (type == DiagnoseFeatureTypeEnum.Dis.getKey()) {
-			typeName = TermEnum.getName(0);
-		} else if (type == DiagnoseFeatureTypeEnum.Symptom.getKey()) {
-			typeName = TermEnum.getName(1);
-		} else if (type == DiagnoseFeatureTypeEnum.Vital.getKey()) {
-			typeName = TermEnum.getName(2);
-		} else if (type == DiagnoseFeatureTypeEnum.Lis.getKey()) {
-			if (questionType == 2) {
-				typeName = TermEnum.getName(3);
-			}
-			if (questionType == 3) {
-				typeName = TermEnum.getName(4);
-			}
-			if (questionType == 4) {
-				typeName = TermEnum.getName(5);
-			}
-		} else if (type == DiagnoseFeatureTypeEnum.Pacs.getKey()) {
-			if (questionType == 2) {
-				typeName = TermEnum.getName(6);
-			}
-			if (questionType == 3) {
-				typeName = TermEnum.getName(7);
-			}
-		} else if (type == DiagnoseFeatureTypeEnum.Antidiastole.getKey()) {
-			typeName = TermEnum.getName(8);
-		} else if (type == DiagnoseFeatureTypeEnum.History.getKey()) {
-			typeName = TermEnum.getName(8);
-		} else if (type == DiagnoseFeatureTypeEnum.Cause.getKey()) {
-			typeName = TermEnum.getName(9);
-		} else if (type == DiagnoseFeatureTypeEnum.CourseOfDisease.getKey()) {
-			typeName = TermEnum.getName(10);
-		} else if (type == DiagnoseFeatureTypeEnum.Other.getKey()) {
-			typeName = TermEnum.getName(10);
-		}
-		return typeName;
-	}
-	/**
-	 * 导出公式类型转换
-	 * 
-	 */
-	public String getDisType(Integer type) {
-		String typeName = "";
-		
-		typeName = DiagnoseFeatureTypeEnum.getName(type);
-		if(typeName == null){
-			typeName = DiagnoseTypeEnum.getName(type);
-		}
-		return typeName;
-	}
-	/**
-	 * 导出公式和标准词切换
-	 * 
-	 */
-	public String getRelation(Integer type, DiagnoseDetail diagnose ) {
-		String typeName = "";
-		String relation = "";
-		typeName = DiagnoseFeatureTypeEnum.getName(type);
-		relation =  diagnose.getRelation();
-		if(typeName == null ){
-			relation =  diagnose.getFormula();
-		}
-		return relation;
-	}
-	/**
-	 * 导出结果处理
-	 */
-	public String getResults(Integer type, DiagnoseDetail diagnose ){
-		String getResult = "";
-		String result = "";
-		if(type == DiagnoseFeatureTypeEnum.Lis.getKey()){
-			String res = diagnose.getResult();
-			if(diagnose.getRelation() != null && !diagnose.getRelation().trim().equals("")){
-				// 分割出所有的数字
-				String[] split = res.split("、");
-				List<String> numberList = new ArrayList<String>();
-				for (int i = 0; i < split.length; i++) {
-					if (!split[i].equals("")) {
-						numberList.add(diagnose.getRelation()+split[i]);
-					}
-				}
-				getResult = numberList.toString();	
-			}else{
-				getResult = "";	
-			}
-			
-		}else {
-			getResult = diagnose.getResult();
-		}
-		
-		
-		return getResult;
-	}
+    @Autowired
+    DiagnoseQuestionService diagnoseQuestionService;
+    @Autowired
+    @Qualifier("diagnoseDetailServiceImpl")
+    DiagnoseDetailService diagnoseDetailService;
+
+    @SuppressWarnings("null")
+    public RespDTO<DiagnoseImportDTO> importDiagnosticBasisAll(MultipartFile file, HttpServletRequest request) {
+
+        List<String> messages = new ArrayList<>();
+        InputStream inputStream = null;
+        DiagnoseImportDTO diagnoseImportDTO = new DiagnoseImportDTO();
+        List<FeatureDTO> featureList = new ArrayList<FeatureDTO>();
+        List<EquationDTO> equationList = new ArrayList<EquationDTO>();
+        List<String> assemblys = new ArrayList<String>();
+        Workbook wb = null;
+        try {
+            if (!file.isEmpty()) {
+                inputStream = file.getInputStream();
+                if (inputStream.available() > 512000) {
+                    messages.add("化验文件最大支持500KB！");
+                } else {
+                    String fileName = file.getOriginalFilename();
+                    if (fileName.lastIndexOf(".") != -1) {
+                        String type = fileName.substring(fileName.lastIndexOf("."));
+                        if (type.equals(".xls")) {
+                            wb = new HSSFWorkbook(inputStream);
+                        } else if (type.equals(".xlsx")) {
+                            wb = new XSSFWorkbook(inputStream);
+                        }
+                        if (wb != null) {
+                            Sheet sheet = wb.getSheetAt(0);
+                            diagnoseImportDTO.setDisName(sheet.getSheetName());
+                            int count = 0;
+                            String name, code, standardWord, associatedWord, consequence;
+                            for (Row row : sheet) {
+                                count++;
+                                try {
+                                    if (row != null) {
+                                        name = getValue(row.getCell(0)).trim().replace(" ", "");
+                                        code = getValue(row.getCell(1)).trim().replace(" ", "");
+                                        standardWord = getValue(row.getCell(2)).trim();
+                                        associatedWord = getValue(row.getCell(3)).trim();
+                                        consequence = getValue(row.getCell(4)).trim();
+
+                                    } else {
+                                        name = null;
+                                        code = null;
+                                        standardWord = null;
+                                        associatedWord = null;
+                                        consequence = null;
+
+                                    }
+
+                                    if (count == 1 && name.equals("类型")) {
+                                        continue;
+                                    }
+
+                                    if (StringUtil.isEmpty(name)) {
+                                        messages.add("第" + count + "行数据不规范,类型必填;");
+                                        continue;
+                                    }
+                                    FeatureDTO feature = new FeatureDTO();
+                                    EquationDTO equation = new EquationDTO();
+                                    if (code.equals("")) {
+                                        equation.setType(name);
+                                        equation.setAssociated(associatedWord);
+                                        equationList.add(equation);
+                                    } else {
+                                        feature.setType(name);
+                                        feature.setCode(code);
+                                        feature.setResult(consequence);
+                                        feature.setAssociated(associatedWord);
+                                        feature.setStandard(standardWord);
+                                        featureList.add(feature);
+
+                                    }
+
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    throw new CommonException(CommonErrorCode.NOT_EXISTS, e.toString());
+                                    // logger.error("",e);
+                                }
+                            }
+                        } else {
+                            // throw new
+                            // CommonException(CommonErrorCode.NOT_EXISTS,
+                            // "非excel文件无法解析！");
+                            messages.add("非excel文件无法解析！");
+                        }
+                    } else {
+                        // throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                        // "未知文件无法解析！");
+                        messages.add("未知文件无法解析！");
+                    }
+                }
+            } else {
+                // throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                // "无文件上传！");
+                messages.add("无文件上传！");
+            }
+
+            diagnoseImportDTO.setEquation(equationList);
+            diagnoseImportDTO.setFeature(featureList);
+            diagnoseImportDTO.setMessages(messages);
+            return RespDTO.onSuc(diagnoseImportDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验excel文件解析出错！");
+            // return response.failure("化验excel文件解析出错！");
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+                if (wb != null) {
+                    wb.close();
+                }
+            } catch (Exception e) {
+            }
+        }
+    }
+
+    private String getValue(Cell cell) {
+        try {
+            Object obj = null;
+            switch (cell.getCellTypeEnum()) {
+                case BOOLEAN:
+                    obj = cell.getBooleanCellValue();
+                    break;
+                case ERROR:
+                    obj = cell.getErrorCellValue();
+                    break;
+                case NUMERIC:
+                    if (HSSFDateUtil.isCellDateFormatted(cell)) {
+                        Date date = cell.getDateCellValue();
+                        obj = DateFormatUtils.format(date, "yyyy-MM-dd");
+                    } else {
+                        obj = cell.getNumericCellValue();
+                        DecimalFormat df = new DecimalFormat();
+                        obj = df.format(obj);
+                    }
+
+                    // obj = cell.getNumericCellValue();
+                    break;
+                case STRING:
+                    obj = cell.getStringCellValue();
+                    break;
+                default:
+                    break;
+            }
+            return obj.toString();
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    public void exportDiagnosticBasis(DiagnosticBasisExportVO diaExportVO, HttpServletResponse response) {
+        QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
+        diaQuery.like("dis_name", diaExportVO.getDisName()).like("question_name", diaExportVO.getQuestion())
+                .like("type", diaExportVO.getType()).eq("is_deleted", IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
+        List<DiagnoseQuestion> datas = diagnoseQuestionService.list(diaQuery);
+
+        GsonUtil.toJson(datas);
+        System.out.println(GsonUtil.toJson(datas));
+        List<String> listName = new ArrayList<>();
+
+        listName.add("归属诊断");
+        listName.add("标准术语*");
+        listName.add("类型*");
+        listName.add("术语同义词*(多个时用\",\"隔开,必须需要包含本体)");
+        listName.add("标准术语说明");
+        listName.add("性别");
+        listName.add("最小年龄");
+        listName.add("最大年龄");
+
+        List<String> listId = new ArrayList<>();
+        listId.add("disName");
+        listId.add("term");
+        listId.add("type");
+        listId.add("termSynonym");
+        listId.add("TermNote");
+        listId.add("sex");
+        listId.add("minAge");
+        listId.add("maxAge");
+
+        List<DiagnosticBasisExportDTO> list = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i++) {
+            DiagnoseQuestion diagnose = datas.get(i);
+            list.add(new DiagnosticBasisExportDTO(diagnose.getDisName(),
+                    diagnose.getQuestionName(),
+                    getType(diagnose.getType(), diagnose.getQuestionType()),
+                    diagnose.getQuestionName(), "", "通用", "0",
+                    "200"));
+
+        }
+        response.setContentType("text/html;charset=UTF-8");
+        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+        ex.exportExcelNew("诊断依据问题词", listName, listId, list, response);
+
+    }
+
+    /**
+     * @param diaAllExportVO
+     * @param response
+     */
+    public void exportDiagnosticAll(DiagnosticAllExportVO diaAllExportVO, HttpServletResponse response) {
+        QueryWrapper<DiagnoseDetail> diaQuery = new QueryWrapper<>();
+        diaQuery.eq("diagnose_id", diaAllExportVO.getDiagnoseId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<DiagnoseDetail> datas = diagnoseDetailService.list(diaQuery);
+
+        System.out.println(GsonUtil.toJson(datas));
+        List<String> listName = new ArrayList<>();
+
+        listName.add("类型");
+        listName.add("序号");
+        listName.add("标准词*");
+        listName.add("是否需要病史采集");
+        listName.add("关联词");
+        listName.add("结果");
+
+        List<String> listId = new ArrayList<>();
+        listId.add("type");
+        listId.add("code");
+        listId.add("standard");
+        listId.add("historyTaking");
+        listId.add("relation");
+        listId.add("result");
+
+
+        String disName = (datas.size() > 0) ? datas.get(0).getDisName() : " ";
+        List<DiagnosticAllExportDTO> list = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i++) {
+            DiagnoseDetail diagnose = datas.get(i);
+            disName = diagnose.getDisName();
+            list.add(new DiagnosticAllExportDTO(getDisType(diagnose.getType()), diagnose.getCode(),
+                    diagnose.getStandard(), "", getRelation(diagnose.getType(), diagnose),
+                    diagnose.getResult()));
+
+        }
+        response.setContentType("text/html;charset=UTF-8");
+        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+        ex.exportExcelNew(disName, listName, listId, list, response);
+
+    }
+
+    /**
+     * 导出类型转换
+     *
+     * @param type
+     * @param questionType
+     * @return
+     */
+    public String getType(Integer type, Integer questionType) {
+        String typeName = "";
+        if (type == DiagnoseFeatureTypeEnum.Dis.getKey()) {
+            typeName = TermEnum.getName(0);
+        } else if (type == DiagnoseFeatureTypeEnum.Symptom.getKey()) {
+            typeName = TermEnum.getName(1);
+        } else if (type == DiagnoseFeatureTypeEnum.Vital.getKey()) {
+            typeName = TermEnum.getName(2);
+        } else if (type == DiagnoseFeatureTypeEnum.Lis.getKey()) {
+            if (questionType == 2) {
+                typeName = TermEnum.getName(3);
+            }
+            if (questionType == 3) {
+                typeName = TermEnum.getName(4);
+            }
+            if (questionType == 4) {
+                typeName = TermEnum.getName(5);
+            }
+        } else if (type == DiagnoseFeatureTypeEnum.Pacs.getKey()) {
+            if (questionType == 2) {
+                typeName = TermEnum.getName(6);
+            }
+            if (questionType == 3) {
+                typeName = TermEnum.getName(7);
+            }
+        } else if (type == DiagnoseFeatureTypeEnum.Antidiastole.getKey()) {
+            typeName = TermEnum.getName(8);
+        } else if (type == DiagnoseFeatureTypeEnum.History.getKey()) {
+            typeName = TermEnum.getName(8);
+        } else if (type == DiagnoseFeatureTypeEnum.Cause.getKey()) {
+            typeName = TermEnum.getName(9);
+        } else if (type == DiagnoseFeatureTypeEnum.CourseOfDisease.getKey()) {
+            typeName = TermEnum.getName(10);
+        } else if (type == DiagnoseFeatureTypeEnum.Other.getKey()) {
+            typeName = TermEnum.getName(10);
+        }
+        return typeName;
+    }
+
+    /**
+     * 导出公式类型转换
+     */
+    public String getDisType(Integer type) {
+        String typeName = "";
+
+        typeName = DiagnoseFeatureTypeEnum.getName(type);
+        if (typeName == null) {
+            typeName = DiagnoseTypeEnum.getName(type);
+        }
+        return typeName;
+    }
+
+    /**
+     * 导出公式和标准词切换
+     */
+    public String getRelation(Integer type, DiagnoseDetail diagnose) {
+        String typeName = "";
+        String relation = "";
+        typeName = DiagnoseFeatureTypeEnum.getName(type);
+        relation = diagnose.getRelation();
+        if (typeName == null) {
+            relation = diagnose.getFormula();
+        }
+        return relation;
+    }
+
 }

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

@@ -25,13 +25,15 @@ public class DiagnoseQuestionFacade  {
 	public IPage<DiagnoseQuestionPageDTO> queryQuestionPage(DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
 		
 		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
-		diaQuery.like("type",diagnoseQuestionPageVO.getType());
-		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
+		diaQuery.like("type",diagnoseQuestionPageVO.getType())
+				.like("dis_name",diagnoseQuestionPageVO.getDisName())
+				.like("question_name",diagnoseQuestionPageVO.getQuestionCode())
+				.eq("is_deleted",IsDeleteEnum.N.getKey())
+				.orderByDesc("gmt_modified");
 				
 		IPage<DiagnoseQuestionPageDTO> datas = diagnoseQuestionService.page(diagnoseQuestionPageVO, diaQuery);
 		
 		return datas;
 	}
-	
 
 }

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

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

@@ -80,12 +80,14 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 
     /**
      * 获取慢病标签组维护
+     *
      * @param evaluationModuleDiseaseIdVO
      * @return
      */
     public List<EvaluationModuleAllDTO> getEvaluationModuleList(EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
         QueryWrapper<Evaluation> evaluationModuleQuery = new QueryWrapper<>();
-        evaluationModuleQuery.eq("concept_id", evaluationModuleDiseaseIdVO.getDiseaseId())
+        evaluationModuleQuery
+                .eq("concept_id", evaluationModuleDiseaseIdVO.getDiseaseId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
         List<Evaluation> datas = list(evaluationModuleQuery);
         // 过滤
@@ -95,6 +97,7 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 
     /**
      * 修改获取慢病标签组维护
+     *
      * @param evaluationModuleListVO
      * @return
      */
@@ -127,6 +130,7 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 
     /**
      * 添加管理评估
+     *
      * @param evaluationModuleListVO
      * @return
      */
@@ -168,16 +172,17 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 
     /**
      * 删除慢病标签组维护
+     *
      * @param evaluationDiseaseIdVO
      * @return
      */
     public boolean cancelEvaluationModuleAll(EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
         UpdateWrapper<Evaluation> evaluaNew = new UpdateWrapper<>();
         evaluaNew.eq("concept_id", evaluationDiseaseIdVO.getDiseaseId())
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", UserUtils.getCurrentPrincipleID())
-                .set("gmt_modified", DateUtil.now());
+                 .eq("is_deleted", IsDeleteEnum.N.getKey())
+                 .set("is_deleted", IsDeleteEnum.Y.getKey())
+                 .set("modifier", UserUtils.getCurrentPrincipleID())
+                 .set("gmt_modified", DateUtil.now());
         return update(new Evaluation(), evaluaNew);
     }
 

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

@@ -43,162 +43,173 @@ import com.diagbot.vo.IndexConfigVO;
 @Component
 public class IndexConfigFacade extends IndexConfigServiceImpl {
 
-	@Autowired
-	@Qualifier("indexConfigServiceImpl")
-	IndexConfigService indexConfigService;
-	@Autowired
-	UserServiceClient userServiceClient;
-	@Autowired
-	ConceptFacade conceptFacade;
-
-	/**
-	 * 分页模糊查询慢病指标值关联维护
-	 * @param indexConfigDiseaseNameVO
-	 * @return
-	 */
-	public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
-		IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
-		List<IndexConfigDTO> data = datas.getRecords();
-		List<String> modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-		Map<String, String> userNames = new HashMap<>();
-		if (ListUtil.isNotEmpty(modifierid)) {
-			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-			if (RespDTOUtil.respIsNG(userNamesDTO)) {
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
-			}
-			userNames = userNamesDTO.data;
-		}
-
-		for (IndexConfigDTO evalua : data) {
-			evalua.setModifier(userNames.get(evalua.getModifier()));
-		}
-		return datas;
-	}
-
-	/**
-	 * 获取慢病指标值关联维护
-	 * @param indexConfigDiseaseIdVO
-	 * @return
-	 */
-	public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-		QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
-		IndexConfigQuery.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted",
-				IsDeleteEnum.N.getKey());
-		List<IndexConfig> datas = list(IndexConfigQuery);
-		// 过滤
-		List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
-
-		List<Long> conceptIds = data.stream().map(ac -> ac.getConceptId()).collect(Collectors.toList());
-		ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
-		conceptSearchVO.setConceptIds(conceptIds);
-		Map<Long, String> indexUniques = new HashMap<>();
-		if (ListUtil.isNotEmpty(conceptIds)) {
-			indexUniques = conceptFacade.getConceptNameMap(conceptSearchVO);
-		}
-
-		for (IndexConfigAllDTO evalua : data) {
-			evalua.setIndexUnique(indexUniques.get(evalua.getConceptId()));
-		}
-
-		return data;
-	}
-
-	/**
-	 * 慢病指标值关联维护修改
-	 * @param indexConfigListVO
-	 * @return
-	 */
-	public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
-		boolean res = false;
-		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
-			IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
-			indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
-			
-			UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
-			IndexConfigNew.eq("disease_id", indexConfigListVO.getDiseaseId());
-			res = indexConfigService.remove(IndexConfigNew);
-			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
-			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
-			Date optDate = DateUtil.now();
-			String operator = UserUtils.getCurrentPrincipleID();
-			for (IndexConfigVO dataNew : data) {
-				IndexConfig IndexConfig = new IndexConfig();
-				BeanUtil.copyProperties(dataNew, IndexConfig);
-				IndexConfig.setGmtCreate(optDate);
-				IndexConfig.setGmtModified(optDate);
-				IndexConfig.setCreator(operator);
-				IndexConfig.setModifier(operator);
-				IndexConfigLsit.add(IndexConfig);
-			}
-
-			res = indexConfigService.saveBatch(IndexConfigLsit);
-
-		}
-
-		return res;
-	}
-
-	/**
-	 * 慢病指标值关联维护添加
-	 * @param indexConfigListVO
-	 * @return
-	 */
-	public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
-		boolean res = false;
-		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
-			List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
-			List<Long> conceptId = new ArrayList<>();
-			for (IndexConfigVO e : indexConfigData) {
-				conceptId.add(e.getConceptId());
-			}
-
-			QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
-
-			IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId()).in("concept_id", conceptId);
-			List<IndexConfig> dataUnique = list(IndexConfigQuery);
-			if (ListUtil.isNotEmpty(dataUnique)) {
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-						"该'" + dataUnique.get(0).getConceptId() + "'已存在");
-			}
-
-			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
-			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
-			Date optDate = DateUtil.now();
-			String operator = UserUtils.getCurrentPrincipleID();
-			for (IndexConfigVO dataNew : data) {
-				IndexConfig IndexConfig = new IndexConfig();
-				BeanUtil.copyProperties(dataNew, IndexConfig);
-				IndexConfig.setGmtCreate(optDate);
-				IndexConfig.setGmtModified(optDate);
-				IndexConfig.setCreator(operator);
-				IndexConfig.setModifier(operator);
-				IndexConfigLsit.add(IndexConfig);
-			}
-			res = indexConfigService.saveBatch(IndexConfigLsit);
-		}
-
-		return res;
-	}
-
-	/**
-	 * 删除慢病指标值关联维护
-	 * @param indexConfigDiseaseIdVO
-	 * @return
-	 */
-	public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-		UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
-		if(indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.Y.getKey())){		
-		IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
-				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-				.set("gmt_modified", DateUtil.now());	
-		}else if (indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.N.getKey())){
-			IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.Y.getKey())
-			.set("is_deleted", IsDeleteEnum.N.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-			.set("gmt_modified", DateUtil.now());		
-		}else{
-			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"state传参有误，应为'Y'或'N'");
-		}
-		return update(new IndexConfig(), IndexConfigNew);
-	}
+    @Autowired
+    @Qualifier("indexConfigServiceImpl")
+    IndexConfigService indexConfigService;
+    @Autowired
+    UserServiceClient userServiceClient;
+    @Autowired
+    ConceptFacade conceptFacade;
+
+    /**
+     * 分页模糊查询慢病指标值关联维护
+     *
+     * @param indexConfigDiseaseNameVO
+     * @return
+     */
+    public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
+        IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
+        List<IndexConfigDTO> data = datas.getRecords();
+        List<String> modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+        Map<String, String> userNames = new HashMap<>();
+        if (ListUtil.isNotEmpty(modifierid)) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (RespDTOUtil.respIsNG(userNamesDTO)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+            }
+            userNames = userNamesDTO.data;
+        }
+
+        for (IndexConfigDTO evalua : data) {
+            evalua.setModifier(userNames.get(evalua.getModifier()));
+        }
+        return datas;
+    }
+
+    /**
+     * 获取慢病指标值关联维护
+     *
+     * @param indexConfigDiseaseIdVO
+     * @return
+     */
+    public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+        QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
+        IndexConfigQuery.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted",
+                IsDeleteEnum.N.getKey());
+        List<IndexConfig> datas = list(IndexConfigQuery);
+        // 过滤
+        List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
+
+        List<Long> conceptIds = data.stream().map(ac -> ac.getConceptId()).collect(Collectors.toList());
+        ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
+        conceptSearchVO.setConceptIds(conceptIds);
+        Map<Long, String> indexUniques = new HashMap<>();
+        if (ListUtil.isNotEmpty(conceptIds)) {
+            indexUniques = conceptFacade.getConceptNameMap(conceptSearchVO);
+        }
+
+        for (IndexConfigAllDTO evalua : data) {
+            evalua.setIndexUnique(indexUniques.get(evalua.getConceptId()));
+        }
+
+        return data;
+    }
+
+    /**
+     * 慢病指标值关联维护修改
+     *
+     * @param indexConfigListVO
+     * @return
+     */
+    public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
+        boolean res = false;
+        if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+            IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
+            indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
+
+            UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
+            IndexConfigNew.eq("disease_id", indexConfigListVO.getDiseaseId());
+            res = indexConfigService.remove(IndexConfigNew);
+            List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
+            List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+            Date optDate = DateUtil.now();
+            String operator = UserUtils.getCurrentPrincipleID();
+            for (IndexConfigVO dataNew : data) {
+                IndexConfig IndexConfig = new IndexConfig();
+                BeanUtil.copyProperties(dataNew, IndexConfig);
+                IndexConfig.setGmtCreate(optDate);
+                IndexConfig.setGmtModified(optDate);
+                IndexConfig.setCreator(operator);
+                IndexConfig.setModifier(operator);
+                IndexConfigLsit.add(IndexConfig);
+            }
+
+            res = indexConfigService.saveBatch(IndexConfigLsit);
+
+        }
+
+        return res;
+    }
+
+    /**
+     * 慢病指标值关联维护添加
+     *
+     * @param indexConfigListVO
+     * @return
+     */
+    public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
+        boolean res = false;
+        if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+            List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
+            List<Long> conceptId = new ArrayList<>();
+            for (IndexConfigVO e : indexConfigData) {
+                conceptId.add(e.getConceptId());
+            }
+
+            QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
+
+            IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId()).in("concept_id", conceptId);
+            List<IndexConfig> dataUnique = list(IndexConfigQuery);
+            if (ListUtil.isNotEmpty(dataUnique)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "该'" + dataUnique.get(0).getConceptId() + "'已存在");
+            }
+
+            List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
+            List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+            Date optDate = DateUtil.now();
+            String operator = UserUtils.getCurrentPrincipleID();
+            for (IndexConfigVO dataNew : data) {
+                IndexConfig IndexConfig = new IndexConfig();
+                BeanUtil.copyProperties(dataNew, IndexConfig);
+                IndexConfig.setGmtCreate(optDate);
+                IndexConfig.setGmtModified(optDate);
+                IndexConfig.setCreator(operator);
+                IndexConfig.setModifier(operator);
+                IndexConfigLsit.add(IndexConfig);
+            }
+            res = indexConfigService.saveBatch(IndexConfigLsit);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除慢病指标值关联维护
+     *
+     * @param indexConfigDiseaseIdVO
+     * @return
+     */
+    public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+        UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
+        if (indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.Y.getKey())) {
+            IndexConfigNew
+                    .eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set("gmt_modified", DateUtil.now());
+        } else if (indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.N.getKey())) {
+            IndexConfigNew
+                    .eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
+                    .eq("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set("gmt_modified", DateUtil.now());
+        } else {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "state传参有误，应为'Y'或'N'");
+        }
+        return update(new IndexConfig(), IndexConfigNew);
+    }
 
 }

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

@@ -29,10 +29,10 @@ public class LibraryInfoFacade extends LibraryInfoServiceImpl {
         long time1 = System.currentTimeMillis();
         redisTemplate.delete("diagnose");
         long time2 = System.currentTimeMillis();
-        sb.append("清空redis数据需要时间：").append((time2 - time1) /1000.0);
+        sb.append("清空redis数据需要时间：").append((time2 - time1) / 1000.0);
         List<RedisWithDiagnoseDTO> libRedisVOS = this.putRedis();
         long time3 = System.currentTimeMillis();
-        sb.append("秒。查询词库数据需要时间：").append((time3 - time2) /1000.0);
+        sb.append("秒。查询词库数据需要时间：").append((time3 - time2) / 1000.0);
         byte[] tt = "diagnose".getBytes();
         List<Object> resultList = redisTemplate.executePipelined(new RedisCallback<Object>() {
             @Override
@@ -51,8 +51,8 @@ public class LibraryInfoFacade extends LibraryInfoServiceImpl {
             }
         });
         long time4 = System.currentTimeMillis();
-        sb.append("秒。添加词库到redis需要时间：").append((time4 - time3) /1000.0);
-        sb.append("秒。总体加载需要时间：").append((time4 - time1) /1000.0).append("秒。");
+        sb.append("秒。添加词库到redis需要时间：").append((time4 - time3) / 1000.0);
+        sb.append("秒。总体加载需要时间：").append((time4 - time1) / 1000.0).append("秒。");
         System.out.println(sb.toString());
         return sb.toString();
     }

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

@@ -300,7 +300,8 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("uniqueNames", uniqueNames);
         List<LisMappingWrapper> lisMappingWrapperList = this.getLisMappingByName(paramMap);
-        List<String> mealNames = lisMappingWrapperList.stream().map(i -> i.getMealName()).filter(j -> j != null).distinct().collect(Collectors.toList());
+        List<String> mealNames = lisMappingWrapperList.stream().map(i -> i.getMealName()).filter(j -> j != null)
+                .distinct().collect(Collectors.toList());
         return mealNames;
     }
 
@@ -314,7 +315,8 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("itemNames", itemNames);
         List<LisMappingWrapper> lisMappingWrapperList = this.getLisMappingByName(paramMap);
-        List<String> mealNames = lisMappingWrapperList.stream().map(i -> i.getMealName()).filter(j -> j != null).distinct().collect(Collectors.toList());
+        List<String> mealNames = lisMappingWrapperList.stream().map(i -> i.getMealName())
+                .filter(j -> j != null).distinct().collect(Collectors.toList());
         return mealNames;
     }
 }

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

@@ -119,8 +119,6 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
     }
 
 
-
-
     /**
      * 量表内容
      *

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

@@ -16,6 +16,7 @@ import com.diagbot.service.impl.VersionDetailServiceImpl;
 import com.diagbot.service.impl.VersionInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VersionDetailIdVO;
@@ -57,7 +58,9 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     public List<VersionDetailDTO> getById(Long id) {
         QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
 
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+        versionDetailQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("STATUS", StatusEnum.Enable.getKey())
                 .eq("version_id", id).orderByAsc("order_no");
 
         VersionDetail versionDetail = new VersionDetail();
@@ -114,42 +117,45 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      * @return
      */
     public List<VersionDetailDTO> getByIds(List<Long> ids) {
-        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
-
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .in("version_id", ids).orderByAsc("order_no");
-
-        List<VersionDetail> datas = list(versionDetailQuery);
         List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-        List<String> modifierid = new ArrayList<>();
-        modifierid = datas.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-        Map<String, String> userNames = new HashMap<>();
-        if (modifierid.size() > 0) {
-            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                        "获取所有用户信息失败");
+        if (ListUtil.isNotEmpty(ids)) {
+            QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+            versionDetailQuery
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("STATUS", StatusEnum.Enable.getKey())
+                    .in("version_id", ids)
+                    .orderByAsc("order_no");
+
+            List<VersionDetail> datas = list(versionDetailQuery);
+            List<String> modifierid = new ArrayList<>();
+            modifierid = datas.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+            Map<String, String> userNames = new HashMap<>();
+            if (modifierid.size() > 0) {
+                RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+                if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                            "获取所有用户信息失败");
+                }
+                userNames = userNamesDTO.data;
             }
-            userNames = userNamesDTO.data;
-        }
 
-        // 过滤字段
-        for (VersionDetail versionData : datas) {
-            VersionDetailDTO versionDTO = new VersionDetailDTO();
-            versionDTO.setId(versionData.getId());
-            //versionDTO.setCreator(versionData.getCreator());
-            versionDTO.setModifierid(userNames.get(versionData.getModifier()));
-            versionDTO.setDescription(versionData.getDescription());
-            versionDTO.setGmtCreate(versionData.getGmtCreate());
-            versionDTO.setOrderNo(versionData.getOrderNo());
-            versionDTO.setRemark(versionData.getRemark());
-            versionDTO.setStatus(versionData.getStatus());
-            versionDTO.setTitle(versionData.getTitle());
-            versionDTO.setVersionId(versionData.getVersionId());
-            dataNew.add(versionDTO);
+            // 过滤字段
+            for (VersionDetail versionData : datas) {
+                VersionDetailDTO versionDTO = new VersionDetailDTO();
+                versionDTO.setId(versionData.getId());
+                //versionDTO.setCreator(versionData.getCreator());
+                versionDTO.setModifierid(userNames.get(versionData.getModifier()));
+                versionDTO.setDescription(versionData.getDescription());
+                versionDTO.setGmtCreate(versionData.getGmtCreate());
+                versionDTO.setOrderNo(versionData.getOrderNo());
+                versionDTO.setRemark(versionData.getRemark());
+                versionDTO.setStatus(versionData.getStatus());
+                versionDTO.setTitle(versionData.getTitle());
+                versionDTO.setVersionId(versionData.getVersionId());
+                dataNew.add(versionDTO);
+            }
         }
         return dataNew;
-
     }
 
     /**
@@ -194,7 +200,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
         //验证主表是否是可修改状态
         checkExistMain(versionDetailres.getVersionId());
         UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
-        versionDetailNew.in("id", versionDetailIdVO.getId())
+        versionDetailNew
+                .in("id", versionDetailIdVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", UserUtils.getCurrentPrincipleID())

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

@@ -63,13 +63,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      * @return
      */
     public IPage<VersionWrapperDTO> getVersionInfoAll(Page page, VersionWrapperNameVO versionWrapperNameVO) {
-        // 模糊查询最新的一条版本信息
-       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .like("name", name).orderByDesc("refresh_time");
-      
-        // 分页查询
-*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+
         IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page, versionWrapperNameVO);
         List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
         List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
@@ -212,7 +206,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         }
         // 2.判断该版本号是否存在名字相同的数据
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
-        templateInfoFand.eq("product_type", versionInfoVO.getProductType())
+        templateInfoFand
+                .eq("product_type", versionInfoVO.getProductType())
                 .eq("name", versionInfoVO.getName())
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
 
@@ -256,7 +251,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         // 1.先判断数据是否存在有效
         checkExist(versionInfoVO.getId());
         UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
-        versionInfoNew.in("id", versionInfoVO.getId())
+        versionInfoNew
+                .in("id", versionInfoVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", UserUtils.getCurrentPrincipleID())
@@ -272,8 +268,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
     private VersionInfo checkExist(Long id) {
         // 1.先判断数据是否存在有效
         QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", id);
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
         VersionInfo versionInfo = getOne(VersionInfoFand, false);
         if (null == versionInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
@@ -297,7 +292,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         }
         //查询最新的一条版本信息
         QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+        versionInfoQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("product_type", versionVO.getProductType())
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByDesc("gmt_modified");

knowledgeman-service/src/main/java/com/diagbot/mapper/DiagnoseMapper.java

@@ -40,6 +40,7 @@ public interface DiagnoseMapper extends BaseMapper<Diagnose> {
 
     /**
      * 批量更新主表信息
+     *
      * @param diagnoseList
      */
     public void updateBatch(List<Diagnose> diagnoseList);

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,37 @@ 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)
+    public void exportDiagnosticBasis(@RequestBody DiagnosticBasisExportVO diaExportVO,
+                                      HttpServletRequest request,
+                                      HttpServletResponse response)
             throws Exception {
-    	diagnoseImportFacade.exportDiagnosticBasis(diaExportVO, response);
-        
+        diagnoseImportFacade.exportDiagnosticBasis(diaExportVO, response);
+
     }
-    
+
     @ApiOperation(value = "导出诊断依据:[by:wangfeng]", notes = "导出诊断依据")
     @PostMapping("/exportDiagnosticAll")
     @SysLoggerExport("exportDiagnosticAll")
     @ResponseBody
-    public  void exportDiagnosticAll(@RequestBody DiagnosticAllExportVO diaAllExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportDiagnosticAll(@RequestBody DiagnosticAllExportVO diaAllExportVO,
+                                    HttpServletRequest request,
+                                    HttpServletResponse response)
             throws Exception {
-    	diagnoseImportFacade.exportDiagnosticAll(diaAllExportVO, response);
-        
+        diagnoseImportFacade.exportDiagnosticAll(diaAllExportVO, response);
+
     }
 }

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

@@ -1,21 +1,19 @@
 package com.diagbot.web;
 
-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 com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DiagnoseQuestionPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DiagnoseQuestionFacade;
 import com.diagbot.vo.DiagnoseQuestionPageVO;
-
 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;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -30,17 +28,17 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "知识库标准化-问题词数据维护相关API[by:wangfeng]", tags = { "知识库标准化-问题词数据维护相关API——WF" })
 public class DiagnoseQuestionController {
 
-	@Autowired
-	DiagnoseQuestionFacade diagnoseQuestionFacade;
+    @Autowired
+    DiagnoseQuestionFacade diagnoseQuestionFacade;
 
-	@ApiOperation(value = "诊断依据问题词数据维护-分页查询[by:wangfeng]")
-	@PostMapping("/queryQuestionPage")
-	@SysLogger("queryQuestionPage")
-	@Transactional
-	public RespDTO<IPage<DiagnoseQuestionPageDTO>> queryQuestionPage(@RequestBody DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
+    @ApiOperation(value = "诊断依据问题词数据维护-分页查询[by:wangfeng]")
+    @PostMapping("/queryQuestionPage")
+    @SysLogger("queryQuestionPage")
+    @Transactional
+    public RespDTO<IPage<DiagnoseQuestionPageDTO>> queryQuestionPage(@RequestBody DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
 
-		IPage<DiagnoseQuestionPageDTO> data = diagnoseQuestionFacade.queryQuestionPage(diagnoseQuestionPageVO);
-		return RespDTO.onSuc(data);
-	}
+        IPage<DiagnoseQuestionPageDTO> data = diagnoseQuestionFacade.queryQuestionPage(diagnoseQuestionPageVO);
+        return RespDTO.onSuc(data);
+    }
 
 }

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/client/KnowledgemanServiceClient.java

@@ -21,7 +21,6 @@ import java.util.Map;
 public interface KnowledgemanServiceClient {
 
 
-
     /**
      * 根据概念Id列表获取概念列表Map
      *

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,36 +191,41 @@ 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())){
-                            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());
                     }
                 }
-                moduleInfoListDTO.setModuleTypeName(ModuleInfoTypeEnum.getName(moduleInfoListDTO.getModuleType().intValue()));
+                moduleInfoListDTO.setModuleTypeName(
+                        ModuleInfoTypeEnum.getName(moduleInfoListDTO.getModuleType().intValue()));
             }
         }
         return moduleInfoDTOIPage;
@@ -240,17 +245,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 +265,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 +323,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 +338,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("group_type", 1)
                 .eq("return_type", 1)
                 .orderByAsc("order_no")
-                .notIn("val",types);
+                .notIn(ListUtil.isNotEmpty(types), "val", types);
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
         List<GetModuleTypeDTO> getModuleTypeDTOS = new ArrayList<>();
         for (DictionaryInfo dictionaryInfo : dictionaryInfoList) {
@@ -350,26 +355,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 +387,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("、");
                     }
                 }
@@ -381,10 +382,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);
@@ -430,7 +433,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)) {

precman-service/src/main/java/com/diagbot/service/QuestionInfoService.java

@@ -39,7 +39,6 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
     public void deleteByIds(Map map);
 
 
-
     /**
      * 检索
      *
@@ -58,7 +57,6 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
     IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO);
 
 
-
     /**
      * 获取关联的父级标签
      *

precman-service/src/main/java/com/diagbot/vo/AddModuleInfoVO.java

@@ -16,15 +16,15 @@ import java.util.List;
 public class AddModuleInfoVO {
     //模板id，修改时传，新增不用传
     private Long id;
-    @NotNull(message="模板名称不能为空")
+    @NotNull(message = "模板名称不能为空")
     private String name;
-    @NotNull(message="模板归属不能为空")
+    @NotNull(message = "模板归属不能为空")
     private String type;
     //特殊标签归属类型
     private Integer textType;
     //标签id
     private List<AddModuleDetailVO> moduleDetail;
-    @NotNull(message="模板类型不能为空")//模板类型（通用，普通，慢病）
+    @NotNull(message = "模板类型不能为空")//模板类型（通用，普通，慢病）
     private Long moduleType;
     //关联id
     private Long relationId;

precman-service/src/main/java/com/diagbot/vo/ModuleGetQuestionInfoVO.java

@@ -32,6 +32,6 @@ public class ModuleGetQuestionInfoVO {
     /**
      * 标签类型
      */
-    @NotNull(message="归属类型不能为空")
+    @NotNull(message = "归属类型不能为空")
     private Integer type;
 }

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

tran-service/src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -24,9 +24,7 @@ public class SysSetFacade extends SysSetServiceImpl {
      * @return
      */
     public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
-        //		 QueryWrapper<SysSet> queryWrapper = new QueryWrapper<SysSet>();
-        //	        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-        //	        			.in("hospital_code", hospitalSetVO.getHospitalCode());
+        
         if (IntegerUtil.isNull(hospitalSetVO.getPlan())) {
             hospitalSetVO.setPlan(0);
         }

tran-service/src/main/java/com/diagbot/facade/TranLisConfigFacade.java

@@ -76,7 +76,9 @@ public class TranLisConfigFacade extends TranLisConfigServiceImpl{
 	public Map<String, List<String>> getLisConfigByUniqueNameAndHosCode(LisConfigVO lisConfigVO) {
 		Map<String, List<String>> retMap = new LinkedHashMap<>();
 		QueryWrapper<TranLisConfig> tranLisConfigQueryWrapper = new QueryWrapper<>();
-		tranLisConfigQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_code",lisConfigVO.getHosCode());
+		tranLisConfigQueryWrapper
+				.eq("is_deleted", IsDeleteEnum.N.getKey())
+				.eq("hospital_code",lisConfigVO.getHosCode());
 		if(ListUtil.isNotEmpty(lisConfigVO.getUniqueNameList())){
 			tranLisConfigQueryWrapper.in("unique_name",lisConfigVO.getUniqueNameList());
 		}

tran-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -1,25 +1,22 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-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 com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexDataFacade;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
-
 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;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -35,28 +32,33 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class IndexDataController {
 
-	@Autowired
-	IndexDataFacade indexDataFacade;
+    @Autowired
+    IndexDataFacade indexDataFacade;
 
-	@ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ids：查询的指标id")
-	@PostMapping("/getIndexDatas")
-	@SysLogger("getIndexDatas")
-	public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]",
+                  notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> " +
+                          "startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ids：查询的指标id")
+    @PostMapping("/getIndexDatas")
+    @SysLogger("getIndexDatas")
+    public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
 
-		 List<IndexDataDTO> data = indexDataFacade.quisitionIndexDataAll(indexDataFindVO);
+        List<IndexDataDTO> data = indexDataFacade.quisitionIndexDataAll(indexDataFindVO);
 
-		return RespDTO.onSuc(data);
-	}
+        return RespDTO.onSuc(data);
+    }
 
-	@ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
-	@PostMapping("/saveIndexDatas")
-	@SysLogger("saveIndexDatas")
-	@Transactional
-	public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
+    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]",
+                  notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> " +
+                          "IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 " +
+                          "indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @PostMapping("/saveIndexDatas")
+    @SysLogger("saveIndexDatas")
+    @Transactional
+    public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
 
-		boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
+        boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
 
-		return RespDTO.onSuc(res);
-	}
+        return RespDTO.onSuc(res);
+    }
 }
 

triage-service/src/main/java/com/diagbot/dto/PartDTO.java

@@ -14,6 +14,6 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class PartDTO extends ConceptBaseDTO{
+public class PartDTO extends ConceptBaseDTO {
     private List<Symptom> symptomList = new ArrayList<>(); //症状列表
 }

triage-service/src/main/java/com/diagbot/dto/PartSymptomDTO.java

@@ -13,6 +13,6 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class PartSymptomDTO extends ConceptBaseDTO{
+public class PartSymptomDTO extends ConceptBaseDTO {
     private List<PartDTO> partDTO = new ArrayList<>(); //部位信息
 }

triage-service/src/main/java/com/diagbot/dto/SymptomSearchDTO.java

@@ -10,7 +10,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class SymptomSearchDTO extends ConceptBaseDTO{
+public class SymptomSearchDTO extends ConceptBaseDTO {
     //同义词
     private String searchName;
     //标签显示类型

triage-service/src/main/java/com/diagbot/dto/VersionDetailDTO.java

@@ -6,7 +6,6 @@ import lombok.Setter;
 import java.util.Date;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 上午11:12:12
@@ -14,8 +13,8 @@ import java.util.Date;
 @Getter
 @Setter
 public class VersionDetailDTO {
-	
-	private Long id;
+
+    private Long id;
 
     /**
      * 记录创建时间
@@ -25,9 +24,9 @@ public class VersionDetailDTO {
     /**
      * 创建人，0表示无创建人值
      */
-   // private String creator;
+    // private String creator;
+
 
-  
     /**
      * 版本主表id
      */
@@ -51,7 +50,7 @@ public class VersionDetailDTO {
     /**
      * 1：启动，0：不启用
      */
-  //  private String status;
+    //  private String status;
 
     /**
      * 备注

triage-service/src/main/java/com/diagbot/dto/VersionWrapperDTO.java

@@ -7,7 +7,6 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 上午11:09:33
@@ -15,34 +14,34 @@ import java.util.List;
 @Getter
 @Setter
 public class VersionWrapperDTO {
-	
-	private Long id;
-	/**
-	 * 记录创建时间
-	 */
-	private Date gmtCreate;
-
-	/**
-	 * 创建人，0表示无创建人值
-	 */
-	private String creator;
-
-	/**
-	 * 名称
-	 */
-	private String name;
-
-	private Date refreshTime;
-
-	/**
-	 * 1：启动，0：不启用
-	 */
-	private String status;
-
-	private List<VersionDetailDTO> detail;
-	/**
-	 * 备注
-	 */
-	private String remark;
+
+    private Long id;
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    private Date refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    private List<VersionDetailDTO> detail;
+    /**
+     * 备注
+     */
+    private String remark;
 
 }

triage-service/src/main/java/com/diagbot/enums/FixPartEnum.java

@@ -3,7 +3,6 @@ package com.diagbot.enums;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description: 诊断类型
  * @date 2018年11月21日 下午2:31:42

triage-service/src/main/java/com/diagbot/enums/ShowTypeEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description: 诊断类型
  * @date 2018年11月21日 下午2:31:42

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 {
 
-
 }