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

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

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

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

@@ -86,12 +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;
     }
 

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) {
@@ -138,17 +144,20 @@ public class RetrievalFacade {
                 }
             }
             //获取questionId
-            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("tag_name", questionNames)
-                    .eq("item_type", 0)
-                    .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));
-            for (RetrievalDTO retrievalDTOInfo : retrievalDTOList.data) {
-                if (null != questionInfoMap.get(retrievalDTOInfo.getName())) {//设置questionId
-                    retrievalDTOInfo.setQuestionId(questionInfoMap.get(retrievalDTOInfo.getName()).getId());
+            if (ListUtil.isNotEmpty(questionNames)){
+                QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+                questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("tag_name", questionNames)
+                        .eq("item_type", 0)
+                        .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));
+                for (RetrievalDTO retrievalDTOInfo : retrievalDTOList.data) {
+                    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
@@ -165,6 +162,10 @@ 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

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

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

@@ -158,7 +158,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
         this.update(new Diagnose(), new UpdateWrapper<Diagnose>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("has_question", HasQuestionEnum.NO_QUESTION.getKey())
-                .set("neo_update", DateUtil.getDateFromTime(1970, 1, 1, 12, 0, 0))
+                .set("neo_update",
+                        DateUtil.getDateFromTime(1970, 1, 1, 12, 0, 0))
         );
         List<Diagnose> diagnoseList = this.list(new QueryWrapper<Diagnose>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -173,15 +174,15 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
     public String addTest() {
         StringBuffer sb = new StringBuffer();
         List<Diagnose> diagnoseList = this.list(new QueryWrapper<Diagnose>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
         );
         List<String> disName = diagnoseList.stream().map(row -> row.getDisName()).collect(Collectors.toList());
         List<LibraryInfo> diagnoses = libraryInfoFacade.page(
                 new Page().setSize(100L), new QueryWrapper<LibraryInfo>()
-                .eq("type_id", 18)
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("is_concept", 1)
-                .notIn(ListUtil.isNotEmpty(disName), "name", disName)
+                        .eq("type_id", 18)
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("is_concept", 1)
+                        .notIn(ListUtil.isNotEmpty(disName), "name", disName)
         ).getRecords();
         List<Diagnose> diagnoseData = new ArrayList<>();
         for (LibraryInfo diagnose : diagnoses) {
@@ -194,10 +195,11 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
         Long time1 = System.currentTimeMillis();
         diagnoseService.saveBatch(diagnoseData);
         Long time2 = System.currentTimeMillis();
-        sb.append("添加主表测试数据:" + (time2-time1)/1000.00 + "秒");
+        sb.append("添加主表测试数据:" + (time2 - time1) / 1000.00 + "秒");
 
         List<DiagnoseDetail> diagnoseDetailList = new ArrayList<>();
-        List<DiagnoseDetail> diagnoseDetailData = diagnoseDetailFacade.list(new QueryWrapper<DiagnoseDetail>().eq("diagnose_id", 7L));
+        List<DiagnoseDetail> diagnoseDetailData =
+                diagnoseDetailFacade.list(new QueryWrapper<DiagnoseDetail>().eq("diagnose_id", 7L));
         for (Diagnose diagnose : diagnoseData) {
             for (DiagnoseDetail detail : diagnoseDetailData) {
                 DiagnoseDetail newDiagDetail = new DiagnoseDetail();
@@ -268,7 +270,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
         verifyDataDTO.setId(id); //设置主键返回
         // 加载词库数据
 //        List<LibraryForDiagnoseDTO> libraryForDiagnoseDTOS = libraryInfoFacade.getLibraryForDiagnose();
-//        Set<String> set = libraryForDiagnoseDTOS.stream().map(row -> row.getName()+ "_"+row.getTypeId()).collect(Collectors.toSet());
+//        Set<String> set = libraryForDiagnoseDTOS.stream().map(row -> row.getName()+ "_"+row.getTypeId())
+//        .collect(Collectors.toSet());
         Set<String> libSet = libraryInfoFacade.getLibraryForDiagnose2();
         // 明细数据
         List<DiagnoseDetail> diagnoseDetailList = new ArrayList<>();
@@ -308,7 +311,6 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
 
     /**
      * 诊断依据校验全部数据（不用修改操作人和时间）
-     *
      */
     public String verifyAllData() {
         StringBuffer res = new StringBuffer();
@@ -331,20 +333,22 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
             List<DiagnoseDetail> diagnoseDetailWithDB = diagnoseDetailFacade.list(new QueryWrapper<DiagnoseDetail>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
             );
-            Map<String, List<DiagnoseDetail>> map = EntityUtil.makeEntityListMap(diagnoseDetailWithDB, "disName");
+            Map<String, List<DiagnoseDetail>> map =
+                    EntityUtil.makeEntityListMap(diagnoseDetailWithDB, "disName");
 
             Long time2 = System.currentTimeMillis();
-            res.append("加载全部主表和明细表：" + (time2-time1)/1000.0).append("秒,");
+            res.append("加载全部主表和明细表：" + (time2 - time1) / 1000.0).append("秒,");
             // 明细数据
             List<DiagnoseDetail> diagnoseDetailList = new ArrayList<>();
             // 问题词数据
             List<DiagnoseQuestion> diagnoseQuestionList = new ArrayList<>();
             // 加载词库数据
 //            List<LibraryForDiagnoseDTO> libraryForDiagnoseDTOS = libraryInfoFacade.getLibraryForDiagnose();
-//            Set<String> set = libraryForDiagnoseDTOS.stream().map(row -> row.getName()+ "_"+row.getTypeId()).collect(Collectors.toSet());
+//            Set<String> set = libraryForDiagnoseDTOS.stream().map(row -> row.getName()+ "_"+row.getTypeId())
+//                              .collect(Collectors.toSet());
             Set<String> libSet = libraryInfoFacade.getLibraryForDiagnose2();
             Long time3 = System.currentTimeMillis();
-            res.append("加载词库：" + (time3-time2)/1000.0).append("秒,");
+            res.append("加载词库：" + (time3 - time2) / 1000.0).append("秒,");
             Boolean flag = true;
             List<Integer> typeList = new ArrayList<>();
             // 校验明细数据
@@ -355,9 +359,11 @@ 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(),
+                        DiagnoseQuestion diagnoseQuestion1 = createDiagnoseQuestion(detail.get(0).getDiagnoseId(),
+                                detail.get(0).getDisName(), DiagnoseFeatureTypeEnum.Dis.getKey(),
                                 detail.get(0).getDisName(), DiagnoseFieldEnum.disName.getKey(), initCommonParam(), ++j);
                         diagnoseQuestionList.add(diagnoseQuestion1);
                         diagnoseName.add(diagnoseQuestion1.getDisName());
@@ -365,7 +371,9 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
 
                     for (DiagnoseDetail bean : detail) {
                         boolean updateFlag = false;
-                        if (DiagnoseTypeEnum.Confirmed.getKey() == bean.getType() || (DiagnoseTypeEnum.Examination.getKey() == bean.getType() || (DiagnoseTypeEnum.Vigilant.getKey() == bean.getType()))) {
+                        if (DiagnoseTypeEnum.Confirmed.getKey() == bean.getType()
+                                || (DiagnoseTypeEnum.Examination.getKey() == bean.getType()
+                                || (DiagnoseTypeEnum.Vigilant.getKey() == bean.getType()))) {
                             // 校验公式
                             String oldVerifyFormula = bean.getVerifyFormula();
                             String errMsg = VerifyUtil.verifyFormula(codeList, bean.getFormula());
@@ -388,7 +396,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                     bean.setVerifyCode(bean.getCode());
                                     diagnoseName.add(bean.getDisName());
                                     // 不需要添加问题词
-//                                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
+//                                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(),
+//                                            bean.getDisName(), bean.getType(),
 //                                            bean.getCode(), DiagnoseFieldEnum.code.getKey(), param, ++j);
 //                                    diagnoseQuestionList.add(diagnoseQuestion);
                                 } else {
@@ -402,11 +411,13 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                             // 校验标准词
                             if (StringUtil.isNotEmpty(bean.getStandard())) {
                                 String oldVerifyStandard = bean.getVerifyStandard();
-                                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.standard.getKey());
+                                typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
+                                        DiagnoseFieldEnum.standard.getKey());
                                 flag = verifyExist(libSet, bean.getStandard(), typeList);
                                 if (!flag) {
                                     bean.setVerifyStandard(bean.getStandard());
-                                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
+                                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(),
+                                            bean.getDisName(), bean.getType(),
                                             bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), param, ++j);
                                     if (addDiagnoseQuestion(diagnosetQuestionSet, diagnoseQuestion)) {
                                         diagnoseQuestionList.add(diagnoseQuestion);
@@ -426,11 +437,13 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 String[] arr = bean.getRelation().split("、");
                                 StringBuffer sb = new StringBuffer();
                                 for (String s : arr) {
-                                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.relation.getKey());
+                                    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(),
+                                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(),
+                                                bean.getDisName(), bean.getType(),
                                                 s.trim(), DiagnoseFieldEnum.relation.getKey(), param, ++j);
                                         if (addDiagnoseQuestion(diagnosetQuestionSet, diagnoseQuestion)) {
                                             diagnoseQuestionList.add(diagnoseQuestion);
@@ -455,11 +468,13 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                                 String[] arr = bean.getResult().split("、");
                                 StringBuffer sb = new StringBuffer();
                                 for (String s : arr) {
-                                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.result.getKey());
+                                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
+                                            DiagnoseFieldEnum.result.getKey());
                                     flag = verifyExist(libSet, s.trim(), typeList);
                                     if (!flag) {
                                         sb.append(s).append("、");
-                                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(), bean.getDisName(), bean.getType(),
+                                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(bean.getDiagnoseId(),
+                                                bean.getDisName(), bean.getType(),
                                                 s.trim(), DiagnoseFieldEnum.result.getKey(), param, ++j);
                                         if (addDiagnoseQuestion(diagnosetQuestionSet, diagnoseQuestion)) {
                                             diagnoseQuestionList.add(diagnoseQuestion);
@@ -486,7 +501,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 }
             }
             Long time4 = System.currentTimeMillis();
-            res.append("校验问题词：" + (time4-time3)/1000.0).append("秒,");
+            res.append("校验问题词：" + (time4 - time3) / 1000.0).append("秒,");
 
             // 更新明细
             if (ListUtil.isNotEmpty(diagnoseDetailList)) {
@@ -494,7 +509,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
             }
 
             Long time5 = System.currentTimeMillis();
-            res.append("更新明细"+diagnoseDetailList.size()+"条：" + (time5-time4)/1000.0).append("秒,");
+            res.append("更新明细" + diagnoseDetailList.size() + "条：" + (time5 - time4) / 1000.0).append("秒,");
 
             // 删除全部的问题词数据
             diagnoseQuestionService.remove(new QueryWrapper<DiagnoseQuestion>());
@@ -504,7 +519,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 diagnoseQuestionService.insertBatch(diagnoseQuestionList); // 效率比框架的saveBatch高很多
             }
             Long time6 = System.currentTimeMillis();
-            res.append("新增问题词" + diagnoseQuestionList.size() + "条：" + (time6-time5)/1000.0).append("秒,");
+            res.append("新增问题词" + diagnoseQuestionList.size() + "条：" + (time6 - time5) / 1000.0).append("秒,");
 
             // 修改问题词表的状态
             List<Diagnose> updateDiagnose = new ArrayList<>();
@@ -525,8 +540,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 diagnoseService.updateBatch(updateDiagnose);
             }
             Long time7 = System.currentTimeMillis();
-            res.append("更新主表" +updateDiagnose.size()+ "条：" + (time7-time6)/1000.0).append("秒,");
-            res.append("总计花费时间：" + (time7-time1)/1000.0).append("秒。");
+            res.append("更新主表" + updateDiagnose.size() + "条：" + (time7 - time6) / 1000.0).append("秒,");
+            res.append("总计花费时间：" + (time7 - time1) / 1000.0).append("秒。");
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, e.getMessage());
         } finally {
@@ -545,7 +560,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
      * @return
      */
     public Boolean addDiagnoseQuestion(Set<String> set, DiagnoseQuestion diagnoseQuestion) {
-        String key = diagnoseQuestion.getDiagnoseId() + "_" + diagnoseQuestion.getType() + "_" + diagnoseQuestion.getQuestionType() + "_" + diagnoseQuestion.getQuestionName();
+        String key = diagnoseQuestion.getDiagnoseId() + "_" + diagnoseQuestion.getType() +
+                "_" + diagnoseQuestion.getQuestionType() + "_" + diagnoseQuestion.getQuestionName();
         if (!set.contains(key)) {
             set.add(key);
             return true;
@@ -555,13 +571,14 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
 
 
     /**
-     *  处理诊断特征业务（校验诊断名称|编码|标准词|关联词|结果）
+     * 处理诊断特征业务（校验诊断名称|编码|标准词|关联词|结果）
      *
      * @param diagnoseWrapper
      * @param param
      * @return
      */
-    public void doDisFuture(DiagnoseWrapper diagnoseWrapper, CommonParam param, Set<String> set,  List<DiagnoseDetail> diagnoseDetailList,  List<DiagnoseQuestion> diagnoseQuestionList) {
+    public void doDisFuture(DiagnoseWrapper diagnoseWrapper, CommonParam param, Set<String> set,
+                            List<DiagnoseDetail> diagnoseDetailList, List<DiagnoseQuestion> diagnoseQuestionList) {
         int i = param.getI();
         int j = param.getJ();
         Set<String> questionSet = new HashSet<>(); // 问题词去重变量
@@ -570,7 +587,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
         boolean flag = true;
         flag = verifyExist(set, diagnoseWrapper.getDisName(), Arrays.asList(LexiconTypeEnum.DIAGNOSIS.getKey()));
         if (!flag) {
-            DiagnoseQuestion diagnoseQuestion1 = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), DiagnoseFeatureTypeEnum.Dis.getKey(),
+            DiagnoseQuestion diagnoseQuestion1 = createDiagnoseQuestion(diagnoseWrapper.getId(),
+                    diagnoseWrapper.getDisName(), DiagnoseFeatureTypeEnum.Dis.getKey(),
                     diagnoseWrapper.getDisName(), DiagnoseFieldEnum.disName.getKey(), param, ++j);
             diagnoseQuestionList.add(diagnoseQuestion1);
             param.setDisNameExist(false); // 标识
@@ -596,7 +614,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                     diagnoseDetail.setVerifyCode(bean.getCode());
                     param.setFlag(HasQuestionEnum.HAS_QUESTION.getKey());
                     // 不需要添加问题词
-//                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), bean.getType(),
+//                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(),
+//                            diagnoseWrapper.getDisName(), bean.getType(),
 //                            bean.getCode(), DiagnoseFieldEnum.code.getKey(), param, ++j);
 //                    if (addDiagnoseQuestion(questionSet, diagnoseQuestion)) {
 //                        diagnoseQuestionList.add(diagnoseQuestion);
@@ -606,11 +625,13 @@ 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());
-                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), bean.getType(),
+                    DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(),
+                            diagnoseWrapper.getDisName(), bean.getType(),
                             bean.getStandard(), DiagnoseFieldEnum.standard.getKey(), param, ++j);
                     if (addDiagnoseQuestion(questionSet, diagnoseQuestion)) {
                         diagnoseQuestionList.add(diagnoseQuestion);
@@ -623,11 +644,13 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 String[] arr = bean.getRelation().split("、");
                 StringBuffer sb = new StringBuffer();
                 for (String s : arr) {
-                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.relation.getKey());
+                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
+                            DiagnoseFieldEnum.relation.getKey());
                     flag = verifyExist(set, s.trim(), typeList);
                     if (!flag) {
                         sb.append(s).append("、");
-                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), bean.getType(),
+                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(),
+                                diagnoseWrapper.getDisName(), bean.getType(),
                                 s.trim(), DiagnoseFieldEnum.relation.getKey(), param, ++j);
                         if (addDiagnoseQuestion(questionSet, diagnoseQuestion)) {
                             diagnoseQuestionList.add(diagnoseQuestion);
@@ -636,7 +659,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 }
                 String errWord = sb.toString();
                 if (StringUtil.isNotEmpty(errWord)) {
-                    diagnoseDetail.setVerifyRelation(errWord.substring(0, errWord.length()-1));
+                    diagnoseDetail.setVerifyRelation(errWord.substring(0, errWord.length() - 1));
                 } else {
                     diagnoseDetail.setVerifyRelation(""); // 将原值清空
                 }
@@ -647,11 +670,13 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 String[] arr = bean.getResult().split("、");
                 StringBuffer sb = new StringBuffer();
                 for (String s : arr) {
-                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(), DiagnoseFieldEnum.result.getKey());
+                    typeList = DiagnoseTypeConvertUtil.diagnoseType2LibType(bean.getType(),
+                            DiagnoseFieldEnum.result.getKey());
                     flag = verifyExist(set, s.trim(), typeList);
                     if (!flag) {
                         sb.append(s).append("、");
-                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(), diagnoseWrapper.getDisName(), bean.getType(),
+                        DiagnoseQuestion diagnoseQuestion = createDiagnoseQuestion(diagnoseWrapper.getId(),
+                                diagnoseWrapper.getDisName(), bean.getType(),
                                 s.trim(), DiagnoseFieldEnum.result.getKey(), param, ++j);
                         if (addDiagnoseQuestion(questionSet, diagnoseQuestion)) {
                             diagnoseQuestionList.add(diagnoseQuestion);
@@ -660,7 +685,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 }
                 String errWord = sb.toString();
                 if (StringUtil.isNotEmpty(errWord)) {
-                    diagnoseDetail.setVerifyResult(errWord.substring(0, errWord.length()-1));
+                    diagnoseDetail.setVerifyResult(errWord.substring(0, errWord.length() - 1));
                 } else {
                     diagnoseDetail.setVerifyResult(""); // 将原值清空
                 }
@@ -676,14 +701,16 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
 
 
     /**
-     *  处理诊断公式业务（校验公式）
+     * 处理诊断公式业务（校验公式）
      *
      * @param diagnoseWrapper
      * @param param
      * @return
      */
-    public void doDisFormula(DiagnoseWrapper diagnoseWrapper, CommonParam param, List<DiagnoseDetail> diagnoseDetailList, List<DiagnoseQuestion> diagnoseQuestionList) {
-        List<String> codeList = diagnoseWrapper.getDisFeature().stream().map(row -> row.getCode()).distinct().collect(Collectors.toList());
+    public void doDisFormula(DiagnoseWrapper diagnoseWrapper, CommonParam param,
+                             List<DiagnoseDetail> diagnoseDetailList, List<DiagnoseQuestion> diagnoseQuestionList) {
+        List<String> codeList = diagnoseWrapper.getDisFeature().stream().map(row -> row.getCode()).distinct()
+                .collect(Collectors.toList());
         codeList.add("拟诊");  // 添加拟诊的编码
         int i = param.getI();
         int j = param.getJ();
@@ -714,7 +741,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
 
 
     /**
-     *  更新主表业务(同时删除明细表和问题词表)
+     * 更新主表业务(同时删除明细表和问题词表)
      *
      * @param diagnoseWrapper
      * @param param
@@ -730,7 +757,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
         }
 //        Diagnose bean = this.getOne(queryWrapper, false);
         if (this.count(queryWrapper) > 0) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"当前疾病的诊断依据已存在！");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "当前疾病的诊断依据已存在！");
         }
 
         Diagnose diagnose = new Diagnose();
@@ -761,7 +788,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
      * @param updateDiagnoseVO
      * @return
      */
-    public void  updateNeo(UpdateDiagnoseVO updateDiagnoseVO) {
+    public void updateNeo(UpdateDiagnoseVO updateDiagnoseVO) {
         // 更新时间
         this.update(new UpdateWrapper<Diagnose>()
                 .eq("id", updateDiagnoseVO.getId())
@@ -793,13 +820,13 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
     /**
      * 校验词库中是否存在
      *
-     * @param set 词库数据
+     * @param set  词库数据
      * @param name 界面输入
      * @param type 转换类型
      * @return 校验结果
      */
     public boolean verifyExist(Set<String> set, String name, List<Integer> type) {
-        for(Integer integer : type) {
+        for (Integer integer : type) {
             if (set.contains(name + "_" + integer)) {
                 return true;
             }
@@ -817,7 +844,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
      * @param commonParam
      * @return
      */
-    public DiagnoseQuestion createDiagnoseQuestion(Long diagnoseId, String disName, Integer type, String questionName, Integer questionType, CommonParam commonParam, Integer orderNo) {
+    public DiagnoseQuestion createDiagnoseQuestion(Long diagnoseId, String disName, Integer type, String questionName,
+                                                   Integer questionType, CommonParam commonParam, Integer orderNo) {
         DiagnoseQuestion dq = new DiagnoseQuestion();
         dq.setCreator(commonParam.getPerson());
         dq.setGmtCreate(commonParam.getNow());

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

@@ -270,7 +270,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;
     }
 
@@ -284,7 +285,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;
@@ -116,45 +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;
-
     }
 
     /**

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

@@ -45,7 +45,9 @@ public class DiagnoseExportImportController {
     @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);
 
@@ -55,7 +57,9 @@ public class DiagnoseExportImportController {
     @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);
 

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

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

@@ -53,7 +53,8 @@ public class UserInfoController {
     @Autowired
     UserAuthenticationFacade userAuthenticationFacade;
 
-    /*@ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
+    /*@ApiOperation(value = "分页查询获取用户信息[by:wangfeng]",
+    notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/getUserInfoPag")
     @SysLogger("getUserInfoPag")
     @ApiIgnore
@@ -140,12 +141,14 @@ public class UserInfoController {
         return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAuthStatus());
     }*/
 
-    @ApiOperation(value = "分页查询注册用户信息接口(新)[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
+    @ApiOperation(value = "分页查询注册用户信息接口(新)[by:wangfeng]",
+            notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/queryUserInformation")
     @SysLogger("queryUserInformation")
     public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO) {
 
-        return userFacade.queryUserInformations(userInfoPagVO, userInfoPagVO.getUserName(), userInfoPagVO.getAuthStatus(), userInfoPagVO.getStartTime(), userInfoPagVO.getEndTime());
+        return userFacade.queryUserInformations(userInfoPagVO, userInfoPagVO.getUserName(),
+                userInfoPagVO.getAuthStatus(), userInfoPagVO.getStartTime(), userInfoPagVO.getEndTime());
     }
 
 
@@ -154,24 +157,30 @@ public class UserInfoController {
     @SysLogger("queryMechanismInformation")
     public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO) {
 
-        return userFacade.queryMechanismInformations(userInfoPagVO, userInfoPagVO.getOrgName(), userInfoPagVO.getStartTime(), userInfoPagVO.getEndTime());
+        return userFacade.queryMechanismInformations(userInfoPagVO, userInfoPagVO.getOrgName(),
+                userInfoPagVO.getStartTime(), userInfoPagVO.getEndTime());
     }
 
 
-    @ApiOperation(value = "分页查询已认证用户信息和机构信息及开通产品接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
+    @ApiOperation(value = "分页查询已认证用户信息和机构信息及开通产品接口（新）[by:wangfeng]",
+            notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryVerifiedUserOrganizationProduct")
     @SysLogger("queryVerifiedUserOrganizationProduct")
-    public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProduct(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
+    public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProduct(
+            @RequestBody UserAndOrgPageVO userAndOrgPageVO) {
 
-        return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO, userAndOrgPageVO.getOrgName(), userAndOrgPageVO.getUserName(), userAndOrgPageVO.getStartTime(), userAndOrgPageVO.getEndTime());
+        return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO, userAndOrgPageVO.getOrgName(),
+                userAndOrgPageVO.getUserName(), userAndOrgPageVO.getStartTime(), userAndOrgPageVO.getEndTime());
     }
 
-    @ApiOperation(value = "分页查询认证中的用户信息接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
+    @ApiOperation(value = "分页查询认证中的用户信息接口（新）[by:wangfeng]",
+            notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryAuthentication")
     @SysLogger("queryAuthentication")
     public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
 
-        return userFacade.queryAuthentications(userAndOrgPageVO, userAndOrgPageVO.getOrgName(), userAndOrgPageVO.getUserName(), userAndOrgPageVO.getStartTime(), userAndOrgPageVO.getEndTime());
+        return userFacade.queryAuthentications(userAndOrgPageVO, userAndOrgPageVO.getOrgName(),
+                userAndOrgPageVO.getUserName(), userAndOrgPageVO.getStartTime(), userAndOrgPageVO.getEndTime());
     }
 
     @ApiOperation(value = "超管修改用户信息接口（新）[by:wangfeng]", notes = "用户id必传")